summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2022-04-29 17:26:17 -0600
committerDave Houlton <euclid@lindenlab.com>2022-04-29 17:26:17 -0600
commit82311e4b44a863078fb1f47d56e9543abaae210c (patch)
tree9da37968aca957045a4750ab1915ba85b172f427 /indra/newview/llviewermenu.cpp
parentf05e58715e0a18a7ba2ace87c2ae45684c864169 (diff)
parent93a025966649e281ceff8d1471bc983cc036bc17 (diff)
Merge branch 'DRTVWR-559' into euclid-17277
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e3de4267dc..f5ea060e82 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8304,6 +8304,12 @@ void handle_cache_clear_immediately()
LLNotificationsUtil::add("ConfirmClearCache", LLSD(), LLSD(), callback_clear_cache_immediately);
}
+void handle_override_environment_map()
+{
+ gPipeline.overrideEnvironmentMap();
+}
+
+
void handle_web_content_test(const LLSD& param)
{
std::string url = param.asString();
@@ -9402,6 +9408,8 @@ void initialize_menus()
view_listener_t::addMenu(new LLDevelopTextureFetchDebugger(), "Develop.SetTexFetchDebugger");
//Develop (clear cache immediately)
commit.add("Develop.ClearCache", boost::bind(&handle_cache_clear_immediately) );
+ //Develop (override environment map)
+ commit.add("Develop.OverrideEnvironmentMap", boost::bind(&handle_override_environment_map));
// Admin >Object
view_listener_t::addMenu(new LLAdminForceTakeCopy(), "Admin.ForceTakeCopy");