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

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

Browse Source 
Conflicts:
	indra/newview/llviewerobjectlist.cpp
	indra/newview/llviewerpartsim.cpp
This commit is contained in:
Shyotl
2014-08-18 23:55:03 -05:00
parent 1b3f0f9ec0 350dff9b98
commit b09f7f5ac7
331 changed files with 8078 additions and 7280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
indra/newview/llviewermenu.cpp
View File

@@ -6480,6 +6480,15 @@ BOOL enable_buy_land(void*)
LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel(), false);
}
class LLWorldVisibleDestinations : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
bool visible(!LFSimFeatureHandler::instance().destinationGuideURL().empty());
gMenuHolder->findControl(userdata["control"].asString())->setValue(visible);
return visible;
}
};
class LLObjectAttachToAvatar : public view_listener_t
{
@@ -8771,6 +8780,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
{
@@ -8983,6 +9030,16 @@ class ListVisibleWebProfile : public view_listener_t
}
};
void ban_from_group(const uuid_vec_t& ids);
class ListBanFromGroup : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
ban_from_group(get_focused_list_ids_selected());
return true;
}
};
class ListCopySLURL : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9300,7 +9357,9 @@ void initialize_menus()
addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
addMenu(new LLWorldEnableTeleportHome(), "World.EnableTeleportHome");
addMenu(new LLWorldEnableBuyLand(), "World.EnableBuyLand");
addMenu(new LLWorldVisibleDestinations(), "World.VisibleDestinations");
(new LLWorldEnvSettings())->registerListener(gMenuHolder, "World.EnvSettings");
(new LLWorldEnableEnvSettings())->registerListener(gMenuHolder, "World.EnableEnvSettings");
// Tools menu
@@ -9498,6 +9557,7 @@ void initialize_menus()
addMenu(new ListEnableMute(), "List.EnableMute");
addMenu(new ListEnableOfferTeleport(), "List.EnableOfferTeleport");
addMenu(new ListVisibleWebProfile(), "List.VisibleWebProfile");
addMenu(new ListBanFromGroup(), "List.BanFromGroup");
addMenu(new ListCopySLURL(), "List.CopySLURL");
addMenu(new ListCopyUUIDs(), "List.CopyUUIDs");
addMenu(new ListInviteToGroup(), "List.InviteToGroup");