Header file cleanup

Moved LLInventoryPanelObserver to be private to LLInventoryPanel

--HG--
branch : avatar-pipeline

3 files changed, 24 insertions, 28 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d7be09efa9..2a1fdb081e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -162,16 +162,6 @@ std::string ICON_NAME[ICON_NAME_COUNT] =
 	"inv_item_linkfolder.tga"

 };

 

-

-// +=================================================+

-// |        LLInventoryPanelObserver                 |

-// +=================================================+

-void LLInventoryPanelObserver::changed(U32 mask)

-{

-	mIP->modelChanged(mask);

-}

-

-

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

 // |        LLInvFVBridge                            |

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

diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 4c7b0a0517..56cb0f93ed 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -107,22 +107,6 @@ struct LLAttachmentRezAction
 	S32		mAttachPt;
 };
 
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// 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;
-};
-
 const std::string safe_inv_type_lookup(LLInventoryType::EType inv_type);
 void hide_context_entries(LLMenuGL& menu, 
 						const std::vector<std::string> &entries_to_show,
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);

+}