merge

--HG--
branch : avatar-pipeline

1 files changed, 24 insertions, 2 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6b1f7313dd..dc704f2b82 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -36,8 +36,6 @@
 

 #include "llinventorypanel.h"

 

-// Seraph TODO: Remove unnecessary headers

-

 #include "llagent.h"

 #include "llagentwearables.h"

 #include "llappearancemgr.h"

@@ -56,6 +54,22 @@ const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("Recent
 const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string("");

 static const LLInventoryFVBridgeBuilder INVENTORY_BRIDGE_BUILDER;

 

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLInventoryPanelObserver

+//

+// Bridge to support knowing when the inventory has changed.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLInventoryPanelObserver : public LLInventoryObserver

+{

+public:

+	LLInventoryPanelObserver(LLInventoryPanel* ip) : mIP(ip) {}

+	virtual ~LLInventoryPanelObserver() {}

+	virtual void changed(U32 mask);

+protected:

+	LLInventoryPanel* mIP;

+};

+

 LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :	

 	LLPanel(p),

 	mInventoryObserver(NULL),

@@ -872,3 +886,11 @@ void example_param_block_usage()
 

 	LLUICtrlFactory::create<LLInventoryPanel>(param_block);

 }

+

+// +=================================================+

+// |        LLInventoryPanelObserver                 |

+// +=================================================+

+void LLInventoryPanelObserver::changed(U32 mask)

+{

+	mIP->modelChanged(mask);

+}