Second Life viewer sources 1.21.0-RC

1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewerkeyboard.h b/linden/indra/newview/llviewerkeyboard.h
index 2013125..115bd69 100644
--- a/linden/indra/newview/llviewerkeyboard.h
+++ b/linden/indra/newview/llviewerkeyboard.h
@@ -40,7 +40,10 @@ const S32 MAX_KEY_BINDINGS = 128; // was 60
 class LLNamedFunction
 {
 public:
-        const char *mName;
+        LLNamedFunction() : mFunction(NULL) { };
+        ~LLNamedFunction() { };
+
+        std::string     mName;
         LLKeyFunc       mFunction;
 };
 
@@ -65,16 +68,16 @@ public:
 
         BOOL                    handleKey(KEY key, MASK mask, BOOL repeated);
 
-        void                    bindNamedFunction(const char *name, LLKeyFunc func);
+        void                    bindNamedFunction(const std::string& name, LLKeyFunc func);
 
-        S32                             loadBindings(const char *filename);                                                                             // returns number bound, 0 on error
+        S32                             loadBindings(const std::string& filename);                                                                              // returns number bound, 0 on error
         EKeyboardMode   getMode();
 
-        BOOL                    modeFromString(const char *string, S32 *mode);                  // False on failure
+        BOOL                    modeFromString(const std::string& string, S32 *mode);                   // False on failure
 
         void                    scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
 protected:
-        BOOL                    bindKey(const S32 mode, const KEY key, const MASK mask, const char *function_name);
+        BOOL                    bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name);
         S32                             mNamedFunctionCount;
         LLNamedFunction mNamedFunctions[MAX_NAMED_FUNCTIONS];