diff options
Diffstat (limited to 'linden/indra/llplugin/llpluginclassmedia.cpp')
-rwxr-xr-x | linden/indra/llplugin/llpluginclassmedia.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp index 85241be..5a81c46 100755 --- a/linden/indra/llplugin/llpluginclassmedia.cpp +++ b/linden/indra/llplugin/llpluginclassmedia.cpp | |||
@@ -72,10 +72,10 @@ LLPluginClassMedia::~LLPluginClassMedia() | |||
72 | } | 72 | } |
73 | 73 | ||
74 | bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) | 74 | bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) |
75 | { | 75 | { |
76 | LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; | 76 | LL_DEBUGS("PluginClassMedia") << "launcher: " << launcher_filename << LL_ENDL; |
77 | LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; | 77 | LL_DEBUGS("PluginClassMedia") << "plugin: " << plugin_filename << LL_ENDL; |
78 | 78 | ||
79 | mPlugin = new LLPluginProcessParent(this); | 79 | mPlugin = new LLPluginProcessParent(this); |
80 | mPlugin->setSleepTime(mSleepTime); | 80 | mPlugin->setSleepTime(mSleepTime); |
81 | 81 | ||
@@ -198,7 +198,7 @@ void LLPluginClassMedia::idle(void) | |||
198 | } | 198 | } |
199 | else | 199 | else |
200 | { | 200 | { |
201 | LL_WARNS("Plugin") << "Unable to pad texture width, padding size " << mPadding << "is not a multiple of pixel size " << mRequestedTextureDepth << LL_ENDL; | 201 | LL_WARNS("PluginClassMedia") << "Unable to pad texture width, padding size " << mPadding << "is not a multiple of pixel size " << mRequestedTextureDepth << LL_ENDL; |
202 | } | 202 | } |
203 | } | 203 | } |
204 | } | 204 | } |
@@ -256,11 +256,11 @@ void LLPluginClassMedia::idle(void) | |||
256 | message.setValueReal("background_b", mBackgroundColor.mV[VZ]); | 256 | message.setValueReal("background_b", mBackgroundColor.mV[VZ]); |
257 | message.setValueReal("background_a", mBackgroundColor.mV[VW]); | 257 | message.setValueReal("background_a", mBackgroundColor.mV[VW]); |
258 | mPlugin->sendMessage(message); // DO NOT just use sendMessage() here -- we want this to jump ahead of the queue. | 258 | mPlugin->sendMessage(message); // DO NOT just use sendMessage() here -- we want this to jump ahead of the queue. |
259 | 259 | ||
260 | LL_DEBUGS("Plugin") << "Sending size_change" << LL_ENDL; | 260 | LL_DEBUGS("PluginClassMedia") << "Sending size_change" << LL_ENDL; |
261 | } | 261 | } |
262 | } | 262 | } |
263 | 263 | ||
264 | if(mPlugin && mPlugin->isRunning()) | 264 | if(mPlugin && mPlugin->isRunning()) |
265 | { | 265 | { |
266 | // Send queued messages | 266 | // Send queued messages |
@@ -777,7 +777,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) | |||
777 | mDirtyRect.unionWith(newDirtyRect); | 777 | mDirtyRect.unionWith(newDirtyRect); |
778 | } | 778 | } |
779 | 779 | ||
780 | LL_DEBUGS("Plugin") << "adjusted incoming rect is: (" | 780 | LL_DEBUGS("PluginClassMedia") << "adjusted incoming rect is: (" |
781 | << newDirtyRect.mLeft << ", " | 781 | << newDirtyRect.mLeft << ", " |
782 | << newDirtyRect.mTop << ", " | 782 | << newDirtyRect.mTop << ", " |
783 | << newDirtyRect.mRight << ", " | 783 | << newDirtyRect.mRight << ", " |
@@ -841,9 +841,9 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) | |||
841 | else if(message_name == "media_status") | 841 | else if(message_name == "media_status") |
842 | { | 842 | { |
843 | std::string status = message.getValue("status"); | 843 | std::string status = message.getValue("status"); |
844 | 844 | ||
845 | LL_DEBUGS("Plugin") << "Status changed to: " << status << LL_ENDL; | 845 | LL_DEBUGS("PluginClassMedia") << "Status changed to: " << status << LL_ENDL; |
846 | 846 | ||
847 | if(status == "loading") | 847 | if(status == "loading") |
848 | { | 848 | { |
849 | mStatus = LLPluginClassMediaOwner::MEDIA_LOADING; | 849 | mStatus = LLPluginClassMediaOwner::MEDIA_LOADING; |
@@ -933,7 +933,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) | |||
933 | } | 933 | } |
934 | else | 934 | else |
935 | { | 935 | { |
936 | LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; | 936 | LL_WARNS("PluginClassMedia") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; |
937 | } | 937 | } |
938 | } | 938 | } |
939 | else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER) | 939 | else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER) |
@@ -990,7 +990,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) | |||
990 | } | 990 | } |
991 | else | 991 | else |
992 | { | 992 | { |
993 | LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; | 993 | LL_WARNS("PluginClassMedia") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; |
994 | } | 994 | } |
995 | } | 995 | } |
996 | else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) | 996 | else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) |
@@ -1001,9 +1001,9 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) | |||
1001 | // if(message_name == "message_name") | 1001 | // if(message_name == "message_name") |
1002 | // { | 1002 | // { |
1003 | // } | 1003 | // } |
1004 | // else | 1004 | // else |
1005 | { | 1005 | { |
1006 | LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; | 1006 | LL_WARNS("PluginClassMedia") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; |
1007 | } | 1007 | } |
1008 | } | 1008 | } |
1009 | 1009 | ||
@@ -1230,6 +1230,6 @@ void LLPluginClassMedia::initializeUrlHistory(const LLSD& url_history) | |||
1230 | message.setValueLLSD("history", url_history); | 1230 | message.setValueLLSD("history", url_history); |
1231 | sendMessage(message); | 1231 | sendMessage(message); |
1232 | 1232 | ||
1233 | LL_DEBUGS("Plugin") << "Sending history" << LL_ENDL; | 1233 | LL_DEBUGS("PluginClassMedia") << "Sending history" << LL_ENDL; |
1234 | } | 1234 | } |
1235 | 1235 | ||