From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- indra/newview/llsavedsettingsglue.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llsavedsettingsglue.h') diff --git a/indra/newview/llsavedsettingsglue.h b/indra/newview/llsavedsettingsglue.h index 8a0f36945c..6c8662dd58 100644 --- a/indra/newview/llsavedsettingsglue.h +++ b/indra/newview/llsavedsettingsglue.h @@ -42,11 +42,11 @@ class LLUICtrl; class LLSavedSettingsGlue { public: - static void setBOOL(LLUICtrl* ctrl, void* name); - static void setS32(LLUICtrl* ctrl, void* name); - static void setF32(LLUICtrl* ctrl, void* name); - static void setU32(LLUICtrl* ctrl, void* name); - static void setString(LLUICtrl* ctrl, void* name); + static void setBOOL(LLUICtrl* ctrl, const std::string& name); + static void setS32(LLUICtrl* ctrl, const std::string& name); + static void setF32(LLUICtrl* ctrl, const std::string& name); + static void setU32(LLUICtrl* ctrl, const std::string& name); + static void setString(LLUICtrl* ctrl, const std::string& name); }; #endif -- cgit v1.2.3