summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-04-28 00:15:11 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-04-28 00:15:11 -0400
commit052e9ed65d2838b8fc89a8c9ac3a1c2eb423a35e (patch)
tree5bce67704348bfcc5bdb9f71ed14f86505f2b5fb
parent557a94e333a1aea1d9f2829683b625c87fcd928e (diff)
parent34869a3f8fb0ac6ed6c17db4a90e28c705829f0d (diff)
Merge branch 'master' of /pichat/repo
-rw-r--r--static/webcam/webcam.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js
index 06a4d1a..411c86d 100644
--- a/static/webcam/webcam.js
+++ b/static/webcam/webcam.js
@@ -42,7 +42,6 @@ window.webcam = {
text = $.trim(text);
if (text != "OK") {
- alert(text);
return;
} else if (typeof pageTracker !== 'undefined') {
pageTracker._trackEvent('Message', 'Webcam', typeof Room !== 'undefined' ? Room : 'UnknownRoom');