Merge remote-tracking branch 'jacek/next' into next

Conflicts (manualy merged):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/primbackup.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/notifications.xml

InWorldz specific crap removed.

1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 752ebb4..85ab779 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1963,6 +1963,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();
@@ -1990,6 +1996,7 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
                                         //llinfos << file << " found" << llendl;
                                 }
                         }
+#endif // LL_LINUX
                 }
                 // profile
                 else if (self->getIMType() == IM_PANEL_PLAIN)