2 files changed, 25 insertions, 9 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 802558a..cdf99e5 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 b7bc07b..51bb456 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -68,14 +68,15 @@
                                                         
                                                         <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>-->