Linux64: for DBUS-Debug build- track where it's crashing (if still).

Add disableDBUS setting as a temporary workaround in case DBUS is still crashing.

3 files changed, 23 insertions, 2 deletions

diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml
index 5f11ed8..d2d8b74 100644
--- a/linden/indra/newview/app_settings/cmd_line.xml
+++ b/linden/indra/newview/app_settings/cmd_line.xml
@@ -333,5 +333,13 @@
       <string>CrashOnStartup</string>
     </map>
 
+    <key>disabledbus</key>
+    <map>
+      <key>desc</key>
+      <string>Disable DBUS API (get SLURL from Webbrowser atm).</string>
+      <key>map-to</key>
+      <string>DisableDBUS</string>
+    </map>
+
   </map>
 </llsd>
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 401b145..9179887 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -40,6 +40,8 @@
                                                 </array>
                                         <key>tags</key>
                                                 <array>
+                                                        <string>DBUS</string>
+<!--Unused debug messages below--><!--
                                                         <string>OpenAL</string>
               <string>APR</string>
                                                         <string>AudioEngine</string>
@@ -52,9 +54,9 @@
                                                         <string>ShaderLoading</string>
               <string>XMLNode</string>
                                                         <string>Openjpeg</string>
-              <!--Unused debug messages below-->
+
               
-              <!--<string>RLV</string>
+              <string>RLV</string>
               <string>Messaging</string>
               <string>ViewerImages</string>
               <string>Throttle</string>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 036b751..5687eb7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -3146,6 +3146,17 @@
       <key>Value</key>
       <string>89556747-24cb-43ed-920b-47caed15465f</string>
     </map>
+    <key>DisableDBUS</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable DBUS API (get SLURL from Webbrowser atm).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DisableCameraConstraints</key>
     <map>
       <key>Comment</key>