diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llcompilequeue.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llcompilequeue.h')
| -rw-r--r-- | indra/newview/llcompilequeue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h index ca5589f902..be7bbd5ceb 100644 --- a/indra/newview/llcompilequeue.h +++ b/indra/newview/llcompilequeue.h @@ -66,7 +66,7 @@ public: protected: LLFloaterScriptQueue(const std::string& name, const LLRect& rect, - const char* title, const char* start_string); + const std::string& title, const std::string& start_string); virtual ~LLFloaterScriptQueue(); // This is the callback method for the viewer object currently @@ -109,7 +109,7 @@ protected: LLUUID mID; static LLMap<LLUUID, LLFloaterScriptQueue*> sInstances; - const char* mStartString; + std::string mStartString; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -144,7 +144,7 @@ protected: S32 status, LLExtStat ext_status); // compile the file given and save it out. - void compile(const char* filename, const LLUUID& asset_id); + void compile(const std::string& filename, const LLUUID& asset_id); // remove any object in mScriptScripts with the matching uuid. void removeItemByAssetID(const LLUUID& asset_id); |