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

Port Hover Height from Alchemy, it's in quicksettings~

Browse Source 
Lots and lots of other sync~
Also has a command /hover
Added /resync command from Alchemy.
This commit is contained in:
Inusaito Sayori
2015-03-25 08:04:24 -04:00
parent a54937b4b8
commit 398014b118
35 changed files with 534 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llviewermenu.cpp
View File

@@ -5892,15 +5892,10 @@ class LLWorldSetBusy : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
if (gAgent.getBusy())
{
gAgent.clearBusy();
}
else
{
gAgent.setBusy();
bool busy = !gAgent.isDoNotDisturb();
gAgent.setDoNotDisturb(busy);
if (busy)
LLNotificationsUtil::add("BusyModeSet");
}
return true;
}
};
@@ -6033,7 +6028,7 @@ bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjec
S32 option = LLNotification::getSelectedOption(notification, response);
if (option == 0)
{
gAgent.clearBusy();
gAgent.setDoNotDisturb(false);
}
LLViewerObject* objectp = selection->getPrimaryObject();
@@ -6069,7 +6064,7 @@ void handle_give_money_dialog()
LLNotification::Params params("BusyModePay");
params.functor(boost::bind(complete_give_money, _1, _2, LLSelectMgr::getInstance()->getSelection()));
if (gAgent.getBusy())
if (gAgent.isDoNotDisturb())
{
// warn users of being in busy mode during a transaction
LLNotifications::instance().add(params);
@@ -9559,13 +9554,13 @@ void region_change()
LLViewerRegion* regionp = gAgent.getRegion();
if (!regionp) return;
if (regionp->getFeaturesReceived())
if (regionp->simulatorFeaturesReceived())
{
parse_simulator_features();
}
else
{
regionp->setFeaturesReceivedCallback(boost::bind(&parse_simulator_features));
regionp->setSimulatorFeaturesReceivedCallback(boost::bind(&parse_simulator_features));
}
}