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

[STORM-1980] Part 3: Region Restarting camera shake reset also pokies at sound trigger

Browse Source 
Don't send sound through the region, it's logically a UI sound. What even is that otherwise?
This commit is contained in:
Inusaito Sayori
2014-04-24 01:25:52 -04:00
parent afacfcee94
commit f666384a1d
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterregionrestarting.cpp
View File

@@ -164,6 +164,16 @@ void LLFloaterRegionRestarting::draw()
} }
} }
void LLFloaterRegionRestarting::onClose(bool app_quitting)
{
if (sShakeState != SHAKE_DONE && sShakeState != SHAKE_START) // Finish shake if needed
{
gAgentCamera.resetView(TRUE, TRUE);
sShakeState = SHAKE_DONE;
}
LLFloater::onClose(app_quitting);
}
void LLFloaterRegionRestarting::updateTime(const U32& time) void LLFloaterRegionRestarting::updateTime(const U32& time)
{ {
mSeconds = time; mSeconds = time;

1
indra/newview/llfloaterregionrestarting.h
View File

@@ -45,6 +45,7 @@ private:
virtual BOOL tick(); virtual BOOL tick();
virtual void refresh(); virtual void refresh();
virtual void draw(); virtual void draw();
virtual void onClose(bool app_quitting);
class LLTextBox* mRestartSeconds; class LLTextBox* mRestartSeconds;
U32 mSeconds; U32 mSeconds;

17
indra/newview/llviewermessage.cpp
View File

@@ -6685,7 +6685,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
else if (notificationID == "RegionRestartMinutes" || notificationID == "RegionRestartSeconds") else if (notificationID == "RegionRestartMinutes" || notificationID == "RegionRestartSeconds")
{ {
update_region_restart(llsdBlock); update_region_restart(llsdBlock);
send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f); LLUI::sAudioCallback(LLUUID(gSavedSettings.getString("UISndRestart")));
return true; // Floater is enough. return true; // Floater is enough.
} }
@@ -6798,7 +6798,7 @@ void process_alert_core(const std::string& message, BOOL modal)
args["MINUTES"] = llformat("%d",mins); args["MINUTES"] = llformat("%d",mins);
update_region_restart(args); update_region_restart(args);
//LLNotificationsUtil::add("RegionRestartMinutes", args); // Floater is enough. //LLNotificationsUtil::add("RegionRestartMinutes", args); // Floater is enough.
send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f); LLUI::sAudioCallback(LLUUID(gSavedSettings.getString("UISndRestart")));
} }
else if (text.substr(0,17) == "RESTART_X_SECONDS") else if (text.substr(0,17) == "RESTART_X_SECONDS")
{ {
@@ -6807,15 +6807,16 @@ void process_alert_core(const std::string& message, BOOL modal)
args["SECONDS"] = llformat("%d",secs); args["SECONDS"] = llformat("%d",secs);
update_region_restart(args); update_region_restart(args);
//LLNotificationsUtil::add("RegionRestartSeconds", args); // Floater is enough. //LLNotificationsUtil::add("RegionRestartSeconds", args); // Floater is enough.
send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f); LLUI::sAudioCallback(LLUUID(gSavedSettings.getString("UISndRestart")));
}
// *NOTE: If the text from the server ever changes this line will need to be adjusted.
else if (text.substr(0, 25) == "Region restart cancelled.")
{
LLFloaterRegionRestarting::hideInstance();
} }
else else
{ {
// *NOTE: If the text from the server ever changes this line will need to be adjusted.
if (text.substr(0, 25) == "Region restart cancelled.")
{
LLFloaterRegionRestarting::hideInstance();
}
std::string new_msg =LLNotificationTemplates::instance().getGlobalString(text); std::string new_msg =LLNotificationTemplates::instance().getGlobalString(text);
// [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5 // [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5
if ( (new_msg == text) && (rlv_handler_t::isEnabled()) ) if ( (new_msg == text) && (rlv_handler_t::isEnabled()) )