summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:27:39 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:27:39 -0700
commitc320b4878ae9cd166594285a88437f0d5c333353 (patch)
treed4b8f11a01bfbeb30cd8e8de96e8c12a1364ff47 /indra/llplugin
parent3ee73ee98d31e572e284371074b7cd4744005a29 (diff)
parent33bd704c58fa707d0a4cc89216538c9d64d6e109 (diff)
merging in latest code
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index dbd96673a1..0644d2638c 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1074,7 +1074,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
mAuthURL = message.getValue("url");
mAuthRealm = message.getValue("realm");
mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_AUTH_REQUEST);
- }
+ }
else if(message_name == "debug_message")
{
mDebugMessageText = message.getValue("message_text");