Skip to content
Snippets Groups Projects
Commit 46b55b6e authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix sound explorer persisting after close

parent 65a130c3
No related branches found
No related tags found
No related merge requests found
...@@ -74,7 +74,9 @@ BOOL ALFloaterExploreSounds::postBuild() ...@@ -74,7 +74,9 @@ BOOL ALFloaterExploreSounds::postBuild()
getChild<LLButton>("look_at_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::handleLookAt, this)); getChild<LLButton>("look_at_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::handleLookAt, this));
getChild<LLButton>("stop_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::handleStop, this)); getChild<LLButton>("stop_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::handleStop, this));
getChild<LLButton>("bl_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::blacklistSound, this)); getChild<LLButton>("bl_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::blacklistSound, this));
getChild<LLButton>("stop_locally_btn")->setClickedCallback(boost::bind(&ALFloaterExploreSounds::handleStopLocally, this));
mStopLocalButton = getChild<LLButton>("stop_locally_btn");
mStopLocalButton->setClickedCallback(boost::bind(&ALFloaterExploreSounds::handleStopLocally, this));
mHistoryScroller = getChild<LLScrollListCtrl>("sound_list"); mHistoryScroller = getChild<LLScrollListCtrl>("sound_list");
mHistoryScroller->setCommitCallback(boost::bind(&ALFloaterExploreSounds::handleSelection, this)); mHistoryScroller->setCommitCallback(boost::bind(&ALFloaterExploreSounds::handleSelection, this));
...@@ -348,7 +350,7 @@ BOOL ALFloaterExploreSounds::tick() ...@@ -348,7 +350,7 @@ BOOL ALFloaterExploreSounds::tick()
} }
} }
childSetEnabled("stop_locally_btn", mLocalPlayingAudioSourceIDs.size() > 0); mStopLocalButton->setEnabled(mLocalPlayingAudioSourceIDs.size() > 0);
return FALSE; return FALSE;
} }
...@@ -377,7 +379,7 @@ void ALFloaterExploreSounds::handlePlayLocally() ...@@ -377,7 +379,7 @@ void ALFloaterExploreSounds::handlePlayLocally()
} }
} }
childSetEnabled("stop_locally_btn", mLocalPlayingAudioSourceIDs.size() > 0); mStopLocalButton->setEnabled(mLocalPlayingAudioSourceIDs.size() > 0);
} }
void ALFloaterExploreSounds::handleLookAt() void ALFloaterExploreSounds::handleLookAt()
......
...@@ -39,6 +39,7 @@ class ALFloaterExploreSounds final ...@@ -39,6 +39,7 @@ class ALFloaterExploreSounds final
LLCheckBoxCtrl* mAvatarSounds; LLCheckBoxCtrl* mAvatarSounds;
LLCheckBoxCtrl* mObjectSounds; LLCheckBoxCtrl* mObjectSounds;
LLCheckBoxCtrl* mPaused; LLCheckBoxCtrl* mPaused;
LLButton* mStopLocalButton = nullptr;
std::list<LLSoundHistoryItem> mLastHistory; std::list<LLSoundHistoryItem> mLastHistory;
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
title="Sounds" title="Sounds"
save_rect="true" save_rect="true"
save_visibility="true" save_visibility="true"
single_instance="true"> single_instance="true"
reuse_instance="false">
<floater.string name="Playing"> <floater.string name="Playing">
Playing Playing
</floater.string> </floater.string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment