diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-07 17:42:07 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-07 17:42:07 +0300 |
| commit | 8a6bfb0e2213151341a25dfc4b411c2718fc64a6 (patch) | |
| tree | 3a279aedec7908be041770347c86c6e7a904c774 /indra | |
| parent | 01ba9f3cd69a40ddffcee84fda95460b0f87629e (diff) | |
Merge fix - clearing duplicates
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 0 insertions, 14 deletions
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 @@ -35,17 +35,6 @@ <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> <key>Comment</key> |