diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-06 07:21:30 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-06 07:21:30 -0800 |
| commit | fdbf7c8d132333b4a841615f4bc08be007729f4b (patch) | |
| tree | 62fdd8e4c1e9ba549cc10b54bc13e791654214c3 /indra/newview/llnearbychat.cpp | |
| parent | 71e934215902690b92cd73f2930391e692ec8ae9 (diff) | |
| parent | af61dd45b3afe8b62dceeb55a2ded7a9cfa34117 (diff) | |
merge.
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 2ad82d3e8e..e7043b2d00 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -63,7 +63,7 @@ static const S32 RESIZE_BAR_THICKNESS = 3; LLNearbyChat::LLNearbyChat(const LLSD& key) - : LLDockableFloater(NULL, false, key) + : LLDockableFloater(NULL, false, false, key) ,mChatHistory(NULL) { @@ -137,7 +137,7 @@ std::string appendTime() time_t utc_time; utc_time = time_corrected(); std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:[" - +LLTrans::getString("TimeMin")+"] "; + +LLTrans::getString("TimeMin")+"]"; LLSD substitution; |