Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

4 files changed, 80 insertions, 13 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index d3068b1..b86385a 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>31</string>
+      <key>default_grids_version</key><string>32</string>
     </map>
 
     <!-- Second Life -->
@@ -60,6 +60,21 @@
       <key>version</key><string>2</string>
     </map>
 
+    <!-- Aurora Grid -->
+    <map>
+      <key>gridname</key>   <string>Aurora-Grid</string>
+      <key>gridnick</key>   <string>auroragrid</string>
+      <key>platform</key>   <string>OpenSim</string>
+      <key>loginuri</key>   <string>http://login.aurora-sim.org:8002/</string>
+      <key>loginpage</key>  <string>http://login.aurora-sim.org/splash/</string>
+      <key>helperuri</key>  <string>http://grid.aurora-sim.org/</string>
+      <key>password</key>   <string />
+      <key>register</key>   <string />
+      <key>support</key>    <string>http://forum.aurora-sim.org/</string>
+      <key>website</key>    <string>http://aurora-sim.org</string>
+      <key>version</key>    <string>0</string>
+    </map>
+
     <!-- WorldSimTerra -->
     <map>
       <key>gridnick</key><string>worldsimterra</string>
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 353ae72..027afaf 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -57,7 +57,8 @@
               <!--<string>Inventory</string>-->
                                                         <!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
-                                                        <!--<string>MediaImpl</string>-->
+                                                        <!--<string>Media</string>-->
+                                                        <string>MediaFilter</string>
                                                         <!--<string>MediaInfo</string>-->
                                                         <!--<string>MediaCallback</string>-->
                                                         <!--<string>MediaBuffering</string>-->
@@ -65,15 +66,18 @@
                                                         <!--<string>MediaState</string>-->
 
                                                         <!--<string>Messaging</string>-->
+                                                        
+                                                        <string>NewsBar</string>
                                                         <!--<string>Notifications</string>-->
-                <string>Plugin</string>
-                <string>PluginClassMedia</string>
-                <string>PluginInstance</string>
-                <string>PluginPipe</string>
-                <string>PluginChild</string>
-                <!--<string>PluginSpam</string>-->
-                <string>PluginParent</string>
-                <string>PluginViewerMedia</string>
+              
+              <!--<string>Plugin</string>-->
+              <!--<string>PluginClassMedia</string>-->
+              <!--<string>PluginInstance</string>-->
+              <!--<string>PluginPipe</string>-->
+              <!--<string>PluginChild</string>-->
+              <!--<string>PluginSpam</string>-->
+              <!--<string>PluginParent</string>-->
+              <!--<string>PluginViewerMedia</string>-->
 
               <!--<string>Radar</string>-->
                                                         <!--<string>ShaderLoading</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index c6375f9..183a910 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -37,7 +37,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-
+  <key>VoiceModule</key>
+  <map>
+    <key>Comment</key>
+    <string>Executable file that runs voice. Platform specific parts (like .exe on windows) are added automatically.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>SLVoice</string>
+  </map>
   <!-- Imprudence-specific settings -->
 
   <key>AllowEditingOfTrees</key>
@@ -851,7 +861,7 @@
   <key>ParticleChat</key>
   <map>
     <key>Comment</key>
-    <string>Chat target of effect beam to channel 9000</string>
+    <string>Chat target of effect beam to channel given by ParticleChatChannel</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -859,6 +869,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ParticleChatChannel</key>
+  <map>
+    <key>Comment</key>
+    <string>Channel for the ParticleChat target</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>118000</integer>
+  </map>
   <key>PersistShowLookAt</key>
   <map>
     <key>Comment</key>
@@ -7958,6 +7979,33 @@
     <key>Value</key>
     <real>3.0</real>
   </map>
+  <key>MediaEnableFilter</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable media domain filtering</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>MediaFilterRect</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for Media Filter floater</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+    </array>
+  </map>
   <key>MediaOnAPrimUI</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index f9b0ba2..bb1b996 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2010.11.13" />
+  <viewer version_test="Experimental 2011.03.11" />
   
 </viewer_version>