diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-19 16:14:19 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-19 16:14:19 +0200 |
commit | 5725b04b084f5ad2699e834421b12795af351975 (patch) | |
tree | 61c78a2a715717c172cc94f9fdd8bd80161991d7 /indra/newview/llappviewer.cpp | |
parent | 88cce61b09d225df0bcd8aab9dbd2c5a01ee7e19 (diff) | |
parent | 884a9887a7a9e833478d266ddf8a7808cdba2ae6 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f82d178089..a5ca06ce30 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3534,6 +3534,7 @@ void LLAppViewer::idle() gEventNotifier.update(); gIdleCallbacks.callFunctions(); + gInventory.notifyObservers(); } if (gDisconnected) @@ -4185,7 +4186,7 @@ void LLAppViewer::loadEventHostModule(S32 listen_port) if(dso_path == "") { - llwarns << "QAModeEventHost requested but module \"" << dso_name << "\" not found!" << llendl; + llerrs << "QAModeEventHost requested but module \"" << dso_name << "\" not found!" << llendl; return; } @@ -4213,7 +4214,7 @@ void LLAppViewer::loadEventHostModule(S32 listen_port) if(status != 0) { - llwarns << "problem loading eventhost plugin, status: " << status << llendl; + llerrs << "problem loading eventhost plugin, status: " << status << llendl; } mPlugins.insert(eventhost_dso_handle); |