diff options
| author | Aleric Inglewood | 2010-10-30 20:29:37 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-02 16:49:49 -0700 |
| commit | 7e6a6ef92f15f4613acd6dcae9eab78f37866376 (patch) | |
| tree | 82ebdf47b22a7d30bfac59036a2b305f3d70b70f /linden/indra/newview | |
| parent | Delete piece of code that is redundant. (diff) | |
| download | meta-impy-7e6a6ef92f15f4613acd6dcae9eab78f37866376.zip meta-impy-7e6a6ef92f15f4613acd6dcae9eab78f37866376.tar.gz meta-impy-7e6a6ef92f15f4613acd6dcae9eab78f37866376.tar.bz2 meta-impy-7e6a6ef92f15f4613acd6dcae9eab78f37866376.tar.xz | |
Make LLStringUtilBase<T>::null a constant.
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llnamelistctrl.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/newview/llnamelistctrl.h | 2 |
2 files changed, 2 insertions, 2 deletions
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() | |||
| 72 | 72 | ||
| 73 | // public | 73 | // public |
| 74 | BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, | 74 | BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, |
| 75 | BOOL enabled, std::string& suffix) | 75 | BOOL enabled, const std::string& suffix) |
| 76 | { | 76 | { |
| 77 | //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl; | 77 | //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl; |
| 78 | 78 | ||
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: | |||
| 58 | // Add a user to the list by name. It will be added, the name | 58 | // Add a user to the list by name. It will be added, the name |
| 59 | // requested from the cache, and updated as necessary. | 59 | // requested from the cache, and updated as necessary. |
| 60 | BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, | 60 | BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, |
| 61 | BOOL enabled = TRUE, std::string& suffix = LLStringUtil::null); | 61 | BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null); |
| 62 | BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM); | 62 | BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM); |
| 63 | 63 | ||
| 64 | virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); | 64 | virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); |