Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync

Browse Source 
Includes:
MAINT-3541 (crash in std::vector >::reserve)
MAINT-3364 FIXED Call clearSelection() from root_folder
MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.
MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to match new MBP with forced Intel graphics
MAINT-3119 FIXED Return common chars for triggers that matches the prefix.
MAINT-3661 Fix for crash when uploading corrupt .dae file.
MAINT-3671 FIXED Rename title when new tab is added.
MAINT-3465 FIXED Add check mark to selected entry.
BUG-5537 FIX reverting breaking changes to pectorals and belly.
MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirmation dialog for teleporting via slapp is added.
This commit is contained in:
Inusaito Sayori
2014-07-11 09:31:51 -04:00
parent e7c506c6ec
commit bc8947289b
27 changed files with 237 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
indra/newview/llviewermenu.cpp
View File

@@ -8762,6 +8762,44 @@ class LLWorldEnvSettings : public view_listener_t
}
};
class LLWorldEnableEnvSettings : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
bool result = false;
std::string tod = userdata.asString();
if (tod == "region")
{
return LLEnvManagerNew::instance().getUseRegionSettings();
}
if (LLEnvManagerNew::instance().getUseFixedSky())
{
if (tod == "sunrise")
{
result = (LLEnvManagerNew::instance().getSkyPresetName() == "Sunrise");
}
else if (tod == "noon")
{
result = (LLEnvManagerNew::instance().getSkyPresetName() == "Midday");
}
else if (tod == "sunset")
{
result = (LLEnvManagerNew::instance().getSkyPresetName() == "Sunset");
}
else if (tod == "midnight")
{
result = (LLEnvManagerNew::instance().getSkyPresetName() == "Midnight");
}
else
{
llwarns << "Unknown item" << llendl;
}
}
return result;
}
};
class SinguCloseAllDialogs : public view_listener_t
{
@@ -9292,6 +9330,7 @@ void initialize_menus()
addMenu(new LLWorldEnableTeleportHome(), "World.EnableTeleportHome");
addMenu(new LLWorldEnableBuyLand(), "World.EnableBuyLand");
(new LLWorldEnvSettings())->registerListener(gMenuHolder, "World.EnvSettings");
(new LLWorldEnableEnvSettings())->registerListener(gMenuHolder, "World.EnableEnvSettings");
// Tools menu