From 67561663da789454c658b5d466e9518790ed9289 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 23 Mar 2011 14:55:28 -0400
Subject: STORM-1101 Using the -login parameter makes some keys and right click
 menus not work

---
 doc/contributions.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 560bedd518..35882d1fb2 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -156,6 +156,8 @@ Angus Boyd
 	VWR-592
 Ann Congrejo
 	CT-193
+Ansariel Hiller
+	STORM-1101
 Ardy Lay
 	VWR-19499
 	VWR-24917
@@ -413,6 +415,7 @@ Jonathan Yap
 	STORM-990
 	STORM-1020
 	STORM-1064
+	STORM-1101
 Kage Pixel
 	VWR-11
 Ken March
-- 
cgit v1.3


From 3c5dc8b9d3a71d2fdcaee83858c7a02a2813f892 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 5 Apr 2011 12:37:03 -0400
Subject: STORM-1098 : Made change to debug setting description for
 ShowNetStatus

---
 doc/contributions.txt                   | 1 +
 indra/newview/app_settings/settings.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 71c54e8624..82f7407c5c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -864,6 +864,7 @@ WolfPup Lowenhar
 	STORM-674
 	STORM-776
 	STORM-825
+	STORM-1098
 	VWR-20741
 	VWR-20933
 Zai Lynch
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dd85c5cb86..490558337b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9557,7 +9557,7 @@
     <key>ShowNetStats</key>
     <map>
       <key>Comment</key>
-      <string>Show the Search Bar in the Status Overlay</string>
+      <string>Show the Status Indicators for the Viewer and Network Usage in the Status Overlay</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-- 
cgit v1.3