diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2026-05-13 22:53:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-13 22:53:45 +0300 |
| commit | 9cd5eb8cac12b50e1590c1a472886c37aae58b7b (patch) | |
| tree | 5d44b45c45a60433102dee05ddf45b44dd3674a3 | |
| parent | 5ffe81be36e55d12c926351c30036304cc6a106e (diff) | |
#5806 add option to reset environment after teleport
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llagent.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 11 |
3 files changed, 28 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dcae9b9e12..5327e5b5eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13229,6 +13229,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SwitchToSharedEnvAfterTeleport</key> + <map> + <key>Comment</key> + <string>Switch to Shared Environment after teleport</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>PreferredBrowserBehavior</key> <map> <key>Comment</key> diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 123ffa676e..31814d8f4f 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -44,6 +44,7 @@ #include "llchicletbar.h" #include "llconsole.h" #include "lldonotdisturbnotificationstorage.h" +#include "llenvironment.h" #include "llfirstuse.h" #include "llfloatercamera.h" #include "llfloaterimcontainer.h" @@ -4172,6 +4173,11 @@ void LLAgent::handleTeleportFinished() mRegionp->setCapabilitiesReceivedCallback(boost::bind(&LLAgent::onCapabilitiesReceivedAfterTeleport)); } } + static LLCachedControl<bool> shared_env_on_teleport(gSavedSettings, "SwitchToSharedEnvAfterTeleport", true); + if (shared_env_on_teleport) + { + LLEnvironment::instance().setSharedEnvironment(); + } LLPerfStats::tunables.autoTuneTimeout = true; } diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 591bf6c712..953398c7bd 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1003,6 +1003,17 @@ parameter="region" /> </menu_item_check> <menu_item_separator/> + <menu_item_check + label="Switch to Shared after teleport" + name="Switch to Shared after teleport"> + <menu_item_check.on_click + function="ToggleControl" + parameter="SwitchToSharedEnvAfterTeleport" /> + <menu_item_check.on_check + function="CheckControl" + parameter="SwitchToSharedEnvAfterTeleport" /> + </menu_item_check> + <menu_item_separator/> <menu_item_call label="My Environments..." name="my_environs"> |