diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-09 13:46:05 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-09 13:46:05 -0800 |
commit | 2554a88ec17998c092368e814254c6ad3928d920 (patch) | |
tree | 39d3e0d9abd21f36dee6d96cc02d2cb5dda3867b /indra/newview/llsidepanelappearance.h | |
parent | 2af183c51d8911a7242b838394863e2606ed3fe7 (diff) | |
parent | 6260ce6a9210192963a77e5b1f44b0d2c2c86591 (diff) |
merge!
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
-rw-r--r-- | indra/newview/llsidepanelappearance.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index b335fd910d..9c870f631a 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -40,6 +40,7 @@ class LLFilterEditor; class LLCurrentlyWornFetchObserver; +class LLWatchForOutfitRenameObserver; class LLPanelEditWearable; class LLWearable; class LLPanelOutfitsInventory; @@ -53,7 +54,7 @@ public: /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); - void refreshCurrentOutfitName(const std::string name = ""); + void refreshCurrentOutfitName(const std::string& name = ""); static void editWearable(LLWearable *wearable, void *data); @@ -91,6 +92,9 @@ private: // Used to make sure the user's inventory is in memory. LLCurrentlyWornFetchObserver* mFetchWorn; + // Used to update title when currently worn outfit gets renamed. + LLWatchForOutfitRenameObserver* mOutfitRenameWatcher; + // Search string for filtering landmarks and teleport // history locations std::string mFilterSubString; |