Make LLStringUtilBase<T>::null a constant.

3 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 3c6cd43..bab89b1 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -209,7 +209,7 @@ public:
         /////////////////////////////////////////////////////////////////////////////////////////
         // Static Utility functions that operate on std::strings
 
-        static std::basic_string<T> null;
+        static std::basic_string<T> const null;
         
         typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
         static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map);
@@ -299,7 +299,7 @@ public:
 
 };
 
-template<class T> std::basic_string<T> LLStringUtilBase<T>::null;
+template<class T> std::basic_string<T> const LLStringUtilBase<T>::null;
 
 typedef LLStringUtilBase<char> LLStringUtil;
 typedef LLStringUtilBase<llwchar> LLWStringUtil;
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index 453cf7f..e445df5 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -72,7 +72,7 @@ LLNameListCtrl::~LLNameListCtrl()
 
 // public
 BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
-                                                                 BOOL enabled, std::string& suffix)
+                                                                 BOOL enabled, const std::string& suffix)
 {
         //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl;
 
diff --git a/linden/indra/newview/llnamelistctrl.h b/linden/indra/newview/llnamelistctrl.h
index 1b7795d..beb4ede 100644
--- a/linden/indra/newview/llnamelistctrl.h
+++ b/linden/indra/newview/llnamelistctrl.h
@@ -58,7 +58,7 @@ public:
         // Add a user to the list by name.  It will be added, the name 
         // requested from the cache, and updated as necessary.
         BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
-                                         BOOL enabled = TRUE, std::string& suffix = LLStringUtil::null);
+                                         BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null);
         BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM);
 
         virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);