pushing what I have for tonight

This commit is contained in:
Hazim Gazov
2010-04-22 04:01:45 -03:00
parent 9dbe415796
commit 6185b0fb0c
5 changed files with 524 additions and 451 deletions

View File

@@ -79,9 +79,10 @@ public:
BOOL allow_multi_select,
LLView *parent_view = NULL);
~LLInventoryPanel();
// <edit>
static std::list<LLInventoryPanel*> sInstances;
// </edit>
// <edit>
static std::list<LLInventoryPanel*> sInstances;
// </edit>
LLInventoryModel* getModel() { return mInventory; }
@@ -141,9 +142,9 @@ protected:
// Given the id and the parent, build all of the folder views.
void rebuildViewsFor(const LLUUID& id, U32 mask);
void buildNewViews(const LLUUID& id);
// <edit>
void buildNewViews(const LLInventoryObject* objectp);
// </edit>
// <edit>
void buildNewViews(const LLInventoryObject* objectp);
// </edit>
public:
// TomY TODO: Move this elsewhere?