diff options
author | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
commit | f7d94905db3f39785863b91f75daf612dc6c3c48 (patch) | |
tree | ca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/newview/llsidepaneliteminfo.h | |
parent | fa1913ea679fd895d709da5c5782b26c7d03a40a (diff) | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) |
merge changes for 3.8.0-release
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.h')
-rwxr-xr-x | indra/newview/llsidepaneliteminfo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h index 12aaca923e..2e24e58a2a 100755 --- a/indra/newview/llsidepaneliteminfo.h +++ b/indra/newview/llsidepaneliteminfo.h @@ -67,6 +67,8 @@ protected: void refreshFromItem(LLViewerInventoryItem* item); private: + static void setAssociatedExperience( LLHandle<LLSidepanelItemInfo> hInfo, const LLSD& experience ); + void startObjectInventoryObserver(); void stopObjectInventoryObserver(); |