summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterscriptlimits.h
diff options
context:
space:
mode:
authorgabriel lee <gabriel@lindenlab.com>2010-01-08 17:09:59 +0000
committergabriel lee <gabriel@lindenlab.com>2010-01-08 17:09:59 +0000
commit427fa3344639873579bb3b75a647463839227e6a (patch)
treebc4006ee1a531ef1dfe68654c02f3cca64a71bcd /indra/newview/llfloaterscriptlimits.h
parentd9b83077867f6171743c934caf868d8e961152c4 (diff)
EXT-3630 & EXT-3893 added object owners to script information floater and corrected memory readout for attachments
reviewed by H
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
-rw-r--r--indra/newview/llfloaterscriptlimits.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index 88239136e3..7e2b536eb6 100644
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -54,12 +54,12 @@ public:
// from LLPanel
virtual void refresh();
-
+
private:
-
+
LLFloaterScriptLimits(const LLSD& seed);
~LLFloaterScriptLimits();
-
+
protected:
LLTabContainer* mTab;
@@ -167,13 +167,17 @@ public:
private:
+ void onNameCache( const LLUUID& id,
+ const std::string& first_name,
+ const std::string& last_name);
+
LLUUID mParcelId;
BOOL mGotParcelMemoryUsed;
BOOL mGotParcelMemoryMax;
S32 mParcelMemoryMax;
S32 mParcelMemoryUsed;
- std::vector<LLUUID> mObjectListIDs;
+ std::vector<LLSD> mObjectListItems;
protected:
@@ -218,7 +222,7 @@ private:
S32 mParcelURLsMax;
S32 mParcelURLsUsed;
- std::vector<LLUUID> mObjectListIDs;
+ std::vector<LLSD> mObjectListItems;
protected: