summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-18 16:25:02 -0400
committerOz Linden <oz@lindenlab.com>2011-04-18 16:25:02 -0400
commit9c995e2a5ce45cc912605d077d704fa76ed904dd (patch)
tree2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/newview/llinventorymodel.h
parent853231580aa2a6bf2894c20495c549a9d5f3c673 (diff)
parent81676d4753a1abe347a69a95f234a005aad0659f (diff)
merge up from viewer-development (with changes for storm-160 backed out)
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r--indra/newview/llinventorymodel.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index f6728fd575..15da09990f 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -425,9 +425,8 @@ public:
// has been indicated.
void idleNotifyObservers();
- // Call to explicitly update everyone on a new state. The optional argument
- // 'service_name' is used by Agent Inventory Service [DEV-20328]
- void notifyObservers(const std::string service_name="");
+ // Call to explicitly update everyone on a new state.
+ void notifyObservers();
// Allows outsiders to tell the inventory if something has
// been changed 'under the hood', but outside the control of the