diff options
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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) | |||
1921 | { | 1921 | { |
1922 | if (caller->getValue().asString() == "history_entry") | 1922 | if (caller->getValue().asString() == "history_entry") |
1923 | { | 1923 | { |
1924 | #ifdef LL_LINUX | ||
1925 | LLSD args; | ||
1926 | args["[FEATURE]"] = LLNotifications::instance().getGlobalString("view history"); | ||
1927 | args["[OS]"] = "Linux"; | ||
1928 | LLNotifications::instance().add("FeatureNotAvailableOnOS", args, LLSD()); | ||
1929 | #else // LL_LINUX | ||
1924 | if (self->getOtherParticipantID().notNull()) | 1930 | if (self->getOtherParticipantID().notNull()) |
1925 | { | 1931 | { |
1926 | std::string fullname = self->getTitle(); | 1932 | std::string fullname = self->getTitle(); |
@@ -1948,6 +1954,7 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata) | |||
1948 | //llinfos << file << " found" << llendl; | 1954 | //llinfos << file << " found" << llendl; |
1949 | } | 1955 | } |
1950 | } | 1956 | } |
1957 | #endif // LL_LINUX | ||
1951 | } | 1958 | } |
1952 | // profile | 1959 | // profile |
1953 | else if (self->getIMType() == IM_PANEL_PLAIN) | 1960 | else if (self->getIMType() == IM_PANEL_PLAIN) |