summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-25 10:48:25 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-25 10:48:25 -0500
commit33450e6f1fc95e3552d2115bf7e4fcf05f3d7916 (patch)
treec1eb91a2cf7c6346d5c5d9c72a1ed841643ee52c /indra/newview/llappviewer.cpp
parent41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff)
parentccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (diff)
Automated merge of ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index edad76a072..3e10c4b2b0 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3546,7 +3546,7 @@ void LLAppViewer::idle()
gEventNotifier.update();
gIdleCallbacks.callFunctions();
- gInventory.notifyObservers();
+ gInventory.idleNotifyObservers();
}
if (gDisconnected)