diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llfloaternewim.cpp | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaternewim.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp index 3199eef..4288209 100644 --- a/linden/indra/newview/llfloaternewim.cpp +++ b/linden/indra/newview/llfloaternewim.cpp | |||
@@ -117,9 +117,9 @@ void LLFloaterNewIM::addTarget(const LLUUID& uuid, const std::string& name, | |||
117 | void LLFloaterNewIM::addAgent(const LLUUID& uuid, void* data, BOOL online) | 117 | void LLFloaterNewIM::addAgent(const LLUUID& uuid, void* data, BOOL online) |
118 | { | 118 | { |
119 | LLScrollListItem* item = new LLScrollListItem(TRUE, data, uuid); | 119 | LLScrollListItem* item = new LLScrollListItem(TRUE, data, uuid); |
120 | char first[DB_FIRST_NAME_BUF_SIZE]; | 120 | char first[DB_FIRST_NAME_BUF_SIZE]; /* Flawfinder: ignore */ |
121 | first[0] = '\0'; | 121 | first[0] = '\0'; |
122 | char last[DB_LAST_NAME_BUF_SIZE]; | 122 | char last[DB_LAST_NAME_BUF_SIZE]; /* Flawfinder: ignore */ |
123 | last[0] = '\0'; | 123 | last[0] = '\0'; |
124 | gCacheName->getName(uuid, first, last); | 124 | gCacheName->getName(uuid, first, last); |
125 | LLUIString fullname = sNameFormat; | 125 | LLUIString fullname = sNameFormat; |
@@ -228,7 +228,6 @@ void LLFloaterNewIM::close(bool app_quitting) | |||
228 | } | 228 | } |
229 | else | 229 | else |
230 | { | 230 | { |
231 | // this shouldn't be called, because we are always hosted | ||
232 | LLFloater::close(app_quitting); | 231 | LLFloater::close(app_quitting); |
233 | } | 232 | } |
234 | } | 233 | } |