Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported).

This commit is contained in:
Shyotl
2012-01-03 20:27:56 -06:00
parent dff195d120
commit a3f7399d7d
14 changed files with 437 additions and 5 deletions

View File

@@ -214,6 +214,7 @@
#include "ascentdaycyclemanager.h"
#include "llfloaterblacklist.h"
#include "scriptcounter.h"
#include "shfloatermediaticker.h"
// </edit>
#include "llavatarnamecache.h"
@@ -2053,6 +2054,10 @@ bool idle_startup()
{
LLFloaterAvatarList::createInstance(false);
}
if (gSavedSettings.getBOOL("SHShowMediaTicker"))
{
SHFloaterMediaTicker::showInstance();
}
// </edit>
if (gSavedSettings.getBOOL("ShowCameraControls"))
{
@@ -2073,6 +2078,8 @@ bool idle_startup()
LLFloaterBeacons::showInstance();
}
if (!gNoRender)
{
//Set up cloud rendertypes. Passed argument is unused.