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/llfloatergodtools.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloatergodtools.h')
| -rw-r--r-- | indra/newview/llfloatergodtools.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloatergodtools.h b/indra/newview/llfloatergodtools.h index 53e250f67e..7cc840cc97 100644 --- a/indra/newview/llfloatergodtools.h +++ b/indra/newview/llfloatergodtools.h @@ -81,7 +81,7 @@ public: static void refreshAll(); - void showPanel(const LLString& panel_name); + void showPanel(const std::string& panel_name); virtual void onClose(bool app_quitting); @@ -164,7 +164,7 @@ public: S32 getRedirectGridY() const; // set internal checkboxes/spinners/combos - void setSimName(char *name); + void setSimName(const std::string& name); void setEstateID(U32 id); void setParentEstateID(U32 id); void setCheckFlags(U32 flags); @@ -201,14 +201,14 @@ public: void refresh(); static void onClickKickAll(void *data); - static void confirmKick(S32 option, const LLString& text, void* userdata); + static void confirmKick(S32 option, const std::string& text, void* userdata); static void finishKick(S32 option, void* userdata); static void onDragSunPhase(LLUICtrl *ctrl, void *userdata); static void onClickFlushMapVisibilityCaches(void* data); static void flushMapVisibilityCachesConfirm(S32 option, void* data); protected: - LLString mKickMessage; // Message to send on kick + std::string mKickMessage; // Message to send on kick }; @@ -268,8 +268,8 @@ public: void refresh(); - static void sendRequest(const char* request, - const char* parameter, + static void sendRequest(const std::string& request, + const std::string& parameter, const LLHost& host); protected: |