diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-14 17:24:20 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-14 17:24:20 -0700 |
| commit | 797a405b3704ec7c7f1aa871a0274c97def7e55e (patch) | |
| tree | 34cbcd96dde3685501bd5c6d3bf23710ba850401 /indra | |
| parent | 5a14e3979cd52387e66a4c594e844c13f513e509 (diff) | |
ER-611: Fix viewer so it can support multiple instances if a SLURL is passed in. Added "SLURLPassToOtherInstance" to settings.xml and check before pushing a slurl to another viewer instance. Reviewed by Kelly
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a94ff89a8e..b09fb9b5ff 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12157,6 +12157,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>SLURLPassToOtherInstance</key> + <map> + <key>Comment</key> + <string>Pass execution to prevoius viewer instances if there is a given slurl</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>soundsbeacon</key> <map> <key>Comment</key> diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d0e1a454fa..2c79749894 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2372,7 +2372,8 @@ bool LLAppViewer::initConfiguration() // it relies on checking a marker file which will not work when running // out of different directories - if (LLStartUp::getStartSLURL().isValid()) + if (LLStartUp::getStartSLURL().isValid() && + !(gSavedSettings.getBOOL("SLURLPassToOtherInstance"))) { if (sendURLToOtherInstance(LLStartUp::getStartSLURL().getSLURLString())) { |