diff options
Diffstat (limited to '')
-rwxr-xr-x | linden/indra/llplugin/llplugininstance.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp index b822b9e..fd1c3c1 100755 --- a/linden/indra/llplugin/llplugininstance.cpp +++ b/linden/indra/llplugin/llplugininstance.cpp | |||
@@ -92,10 +92,10 @@ int LLPluginInstance::load(std::string &plugin_file) | |||
92 | char buf[1024]; | 92 | char buf[1024]; |
93 | apr_dso_error(mDSOHandle, buf, sizeof(buf)); | 93 | apr_dso_error(mDSOHandle, buf, sizeof(buf)); |
94 | 94 | ||
95 | LL_WARNS("Plugin") << "apr_dso_load of " << plugin_file << " failed with error " << result << " , additional info string: " << buf << LL_ENDL; | 95 | LL_WARNS("PluginInstance") << "apr_dso_load of " << plugin_file << " failed with error " << result << " , additional info string: " << buf << LL_ENDL; |
96 | 96 | ||
97 | } | 97 | } |
98 | 98 | ||
99 | if(result == APR_SUCCESS) | 99 | if(result == APR_SUCCESS) |
100 | { | 100 | { |
101 | result = apr_dso_sym((apr_dso_handle_sym_t*)&init_function, | 101 | result = apr_dso_sym((apr_dso_handle_sym_t*)&init_function, |
@@ -104,20 +104,20 @@ int LLPluginInstance::load(std::string &plugin_file) | |||
104 | 104 | ||
105 | if(result != APR_SUCCESS) | 105 | if(result != APR_SUCCESS) |
106 | { | 106 | { |
107 | LL_WARNS("Plugin") << "apr_dso_sym failed with error " << result << LL_ENDL; | 107 | LL_WARNS("PluginInstance") << "apr_dso_sym failed with error " << result << LL_ENDL; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | if(result == APR_SUCCESS) | 111 | if(result == APR_SUCCESS) |
112 | { | 112 | { |
113 | result = init_function(staticReceiveMessage, (void*)this, &mPluginSendMessageFunction, &mPluginUserData); | 113 | result = init_function(staticReceiveMessage, (void*)this, &mPluginSendMessageFunction, &mPluginUserData); |
114 | 114 | ||
115 | if(result != APR_SUCCESS) | 115 | if(result != APR_SUCCESS) |
116 | { | 116 | { |
117 | LL_WARNS("Plugin") << "call to init function failed with error " << result << LL_ENDL; | 117 | LL_WARNS("PluginInstance") << "call to init function failed with error " << result << LL_ENDL; |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | return (int)result; | 121 | return (int)result; |
122 | } | 122 | } |
123 | 123 | ||
@@ -130,12 +130,12 @@ void LLPluginInstance::sendMessage(const std::string &message) | |||
130 | { | 130 | { |
131 | if(mPluginSendMessageFunction) | 131 | if(mPluginSendMessageFunction) |
132 | { | 132 | { |
133 | LL_DEBUGS("Plugin") << "sending message to plugin: \"" << message << "\"" << LL_ENDL; | 133 | LL_DEBUGS("PluginInstance") << "sending message to plugin: \"" << message << "\"" << LL_ENDL; |
134 | mPluginSendMessageFunction(message.c_str(), &mPluginUserData); | 134 | mPluginSendMessageFunction(message.c_str(), &mPluginUserData); |
135 | } | 135 | } |
136 | else | 136 | else |
137 | { | 137 | { |
138 | LL_WARNS("Plugin") << "dropping message: \"" << message << "\"" << LL_ENDL; | 138 | LL_WARNS("PluginInstance") << "dropping message: \"" << message << "\"" << LL_ENDL; |
139 | } | 139 | } |
140 | } | 140 | } |
141 | 141 | ||
@@ -165,11 +165,11 @@ void LLPluginInstance::receiveMessage(const char *message_string) | |||
165 | { | 165 | { |
166 | if(mOwner) | 166 | if(mOwner) |
167 | { | 167 | { |
168 | LL_DEBUGS("Plugin") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL; | 168 | LL_DEBUGS("PluginInstance") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL; |
169 | mOwner->receivePluginMessage(message_string); | 169 | mOwner->receivePluginMessage(message_string); |
170 | } | 170 | } |
171 | else | 171 | else |
172 | { | 172 | { |
173 | LL_WARNS("Plugin") << "dropping incoming message: \"" << message_string << "\"" << LL_ENDL; | 173 | LL_WARNS("PluginInstance") << "dropping incoming message: \"" << message_string << "\"" << LL_ENDL; |
174 | } | 174 | } |
175 | } | 175 | } |