From 8a6bfb0e2213151341a25dfc4b411c2718fc64a6 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 7 Aug 2015 17:42:07 +0300
Subject: Merge fix - clearing duplicates

---
 indra/newview/CMakeLists.txt            |  3 ---
 indra/newview/app_settings/settings.xml | 11 -----------
 2 files changed, 14 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e8e9e3e897..16877c345e 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1018,9 +1018,6 @@ set(viewer_HEADER_FILES
     llnameeditor.h
     llnamelistctrl.h
     llnavigationbar.h
-    llfloaterimnearbychat.h
-    llfloaterimnearbychathandler.h
-    llfloaterimnearbychatlistener.h
     llnetmap.h
     llnotificationhandler.h
     llnotificationmanager.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 477656c04e..4070aaa4e4 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -34,17 +34,6 @@
     <string>U32</string>
     <key>Value</key>
     <integer>768</integer>
-  </map>
-  <key>IMShowTime</key>
-  <map>
-    <key>Comment</key>
-    <string>Enable(disable) timestamp showing in the chat.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
   </map>
     <key>IMShowTime</key>
     <map>
-- 
cgit v1.2.3