diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
| commit | 1a35fe8725d4a55ef1e1b07d59db8e8d0db5e6bf (patch) | |
| tree | 04895ab55cf6ab33f1412131c76a71f4f4d549d4 /indra/newview/llfloaterscriptlimits.h | |
| parent | 8440d99e4498882dfc61459a91eba746ad717000 (diff) | |
| parent | 2aaa7971945823f53f0a01028036c37361bcfa17 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
| -rw-r--r-- | indra/newview/llfloaterscriptlimits.h | 14 |
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: |