diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-27 15:06:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-27 15:06:53 +0200 |
| commit | d3d2a8d537bf1542c152afdb239f7021ebdbe78f (patch) | |
| tree | 602b749a5e2c13384b27a69a845b782449f96748 /indra/newview/llfloaterscriptlimits.h | |
| parent | b68ccadd46d2ff094147ffd72318fd3a728c28eb (diff) | |
| parent | 86cab299b01081c8c89587fd72d81460318e4ec1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
| -rw-r--r-- | indra/newview/llfloaterscriptlimits.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h index 7e2b536eb6..e675d14515 100644 --- a/indra/newview/llfloaterscriptlimits.h +++ b/indra/newview/llfloaterscriptlimits.h @@ -145,7 +145,14 @@ class LLPanelScriptLimitsRegionMemory : public LLPanelScriptLimitsInfo, LLRemote public: LLPanelScriptLimitsRegionMemory() - : LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(), mParcelId(LLUUID()), mGotParcelMemoryUsed(FALSE), mGotParcelMemoryMax(FALSE) {}; + : LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(), + + mParcelId(LLUUID()), + mGotParcelMemoryUsed(FALSE), + mGotParcelMemoryMax(FALSE), + mParcelMemoryMax(0), + mParcelMemoryUsed(0) {}; + ~LLPanelScriptLimitsRegionMemory() { LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this); @@ -167,9 +174,9 @@ public: private: - void onNameCache( const LLUUID& id, - const std::string& first_name, - const std::string& last_name); + void onNameCache(const LLUUID& id, + const std::string& first_name, + const std::string& last_name); LLUUID mParcelId; BOOL mGotParcelMemoryUsed; @@ -200,7 +207,16 @@ class LLPanelScriptLimitsRegionURLs : public LLPanelScriptLimitsInfo public: LLPanelScriptLimitsRegionURLs() - : LLPanelScriptLimitsInfo(), mParcelId(LLUUID()), mGotParcelURLsUsed(FALSE), mGotParcelURLsMax(FALSE) {}; + : LLPanelScriptLimitsInfo(), + + mParcelId(LLUUID()), + mGotParcelURLsUsed(FALSE), + mGotParcelURLsMax(FALSE), + mParcelURLsMax(0), + mParcelURLsUsed(0) + { + }; + ~LLPanelScriptLimitsRegionURLs() { }; |