From 25e482393f2a5070da2b93e71b9d0c1babf0bdd2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 8 Jun 2011 02:10:44 -0500 Subject: Notification: View History (in IM/Group Chat) not available on Linux. Temporary bandaid until IMP-182 is fully fixed. --- linden/indra/newview/llimpanel.cpp | 7 +++++++ linden/indra/newview/skins/default/xui/de/notifications.xml | 4 ++++ linden/indra/newview/skins/default/xui/en-us/notifications.xml | 2 ++ linden/indra/newview/skins/default/xui/zh/notifications.xml | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 5f6624b..4953a27 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp @@ -1921,6 +1921,12 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata) { if (caller->getValue().asString() == "history_entry") { +#ifdef LL_LINUX + LLSD args; + args["[FEATURE]"] = LLNotifications::instance().getGlobalString("view history"); + args["[OS]"] = "Linux"; + LLNotifications::instance().add("FeatureNotAvailableOnOS", args, LLSD()); +#else // LL_LINUX if (self->getOtherParticipantID().notNull()) { std::string fullname = self->getTitle(); @@ -1948,6 +1954,7 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata) //llinfos << file << " found" << llendl; } } +#endif // LL_LINUX } // profile else if (self->getIMType() == IM_PANEL_PLAIN) diff --git a/linden/indra/newview/skins/default/xui/de/notifications.xml b/linden/indra/newview/skins/default/xui/de/notifications.xml index b2975df..3009515 100644 --- a/linden/indra/newview/skins/default/xui/de/notifications.xml +++ b/linden/indra/newview/skins/default/xui/de/notifications.xml @@ -3011,4 +3011,8 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter: http:// Nein + + + Verlauf anzeigen + diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index 7f1d1a4..cb8171d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml @@ -7485,6 +7485,8 @@ Sorry, [FEATURE] is not yet available on [OS]. this feature this operating system + View History + diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml index ec675b2..1234e02 100644 --- a/linden/indra/newview/skins/default/xui/zh/notifications.xml +++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml @@ -3818,6 +3818,10 @@ Socks5 代理服务器 [PROXY] 拒绝了 UDP 关联请求 无法连接到 Socks5 代理服务器 [PROXY] + + 查看对话历史 + +