diff options
Diffstat (limited to 'linden/indra/newview/llimview.cpp')
-rw-r--r-- | linden/indra/newview/llimview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp index 9df51b9..dee1ed2 100644 --- a/linden/indra/newview/llimview.cpp +++ b/linden/indra/newview/llimview.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file LLIMMgr.cpp | 2 | * @file LLIMMgr.cpp |
3 | * @brief Container for Instant Messaging | 3 | * @brief Container for Instant Messaging |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #include "llviewerprecompiledheaders.h" | 32 | #include "llviewerprecompiledheaders.h" |
@@ -164,7 +167,8 @@ BOOL LLFloaterIM::postBuild() | |||
164 | sErrorStringsMap["no_user_911"] = | 167 | sErrorStringsMap["no_user_911"] = |
165 | getFormattedUIString("user_no_help"); | 168 | getFormattedUIString("user_no_help"); |
166 | 169 | ||
167 | sEventStringsMap["add"] = childGetText("add_session_event"); | 170 | sEventStringsMap["add"] = |
171 | getFormattedUIString("add_session_event"); | ||
168 | sEventStringsMap["message"] = | 172 | sEventStringsMap["message"] = |
169 | getFormattedUIString("message_session_event"); | 173 | getFormattedUIString("message_session_event"); |
170 | 174 | ||
@@ -385,7 +389,7 @@ void LLIMMgr::addMessage( | |||
385 | // when answering questions. | 389 | // when answering questions. |
386 | if(gAgent.isGodlike()) | 390 | if(gAgent.isGodlike()) |
387 | { | 391 | { |
388 | // XUI:translate | 392 | // *TODO:translate (low priority, god ability) |
389 | std::ostringstream bonus_info; | 393 | std::ostringstream bonus_info; |
390 | bonus_info << "*** parent estate: " | 394 | bonus_info << "*** parent estate: " |
391 | << parent_estate_id | 395 | << parent_estate_id |