summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-08-09 15:14:53 +0300
committermaxim_productengine <mnikolenko@productengine.com>2012-08-09 15:14:53 +0300
commit3e6c27aa1d31065b82b7d19e7fecae72798e003d (patch)
treefcc3b7405e2850d59dc01f28836569e15d86a14c /indra/newview
parent66391be51338e766ee0724aa06ef8f022269e0a3 (diff)
MAINT-171 FIXED Show "Ad-hoc conference" instead of "Session 1" in floater title
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorypanel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c6df207552..f7567baa2b 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -44,6 +44,7 @@
#include "llinventoryfunctions.h"
#include "llinventorymodelbackgroundfetch.h"
#include "llsidepanelinventory.h"
+#include "lltrans.h"
#include "llviewerattachmenu.h"
#include "llviewerfoldertype.h"
#include "llvoavatarself.h"
@@ -973,7 +974,6 @@ bool LLInventoryPanel::beginIMSession()
std::set<LLUUID> selected_items = mFolderRoot->getSelectionList();
std::string name;
- static int session_num = 1;
LLDynamicArray<LLUUID> members;
EInstantMessage type = IM_SESSION_CONFERENCE_START;
@@ -1053,7 +1053,7 @@ bool LLInventoryPanel::beginIMSession()
if (name.empty())
{
- name = llformat("Session %d", session_num++);
+ name = LLTrans::getString("conference-title");
}
LLUUID session_id = gIMMgr->addSession(name, type, members[0], members);