Added ability to save scripts from objects from File -> Save as... and merged fixes for Unix systems, new detection for viewer 2.0
This commit is contained in:
@@ -52,6 +52,7 @@ extern void request_sound(const LLUUID &sound_guid);
|
||||
|
||||
LLAudioEngine* gAudiop = NULL;
|
||||
|
||||
int gSoundHistoryPruneCounter = 0;
|
||||
|
||||
//
|
||||
// LLAudioEngine implementation
|
||||
@@ -1820,7 +1821,8 @@ void logSoundPlay(LLUUID id, LLAudioSource* audio_source, LLVector3d position, S
|
||||
gSoundHistory[id] = item;
|
||||
}
|
||||
|
||||
static void logSoundStop(LLUUID id)
|
||||
//static
|
||||
void logSoundStop(LLUUID id)
|
||||
{
|
||||
if(gSoundHistory.find(id) != gSoundHistory.end())
|
||||
{
|
||||
@@ -1831,7 +1833,8 @@ static void logSoundStop(LLUUID id)
|
||||
}
|
||||
}
|
||||
|
||||
static void pruneSoundLog()
|
||||
//static
|
||||
void pruneSoundLog()
|
||||
{
|
||||
if(++gSoundHistoryPruneCounter >= 64)
|
||||
{
|
||||
|
||||
@@ -488,10 +488,10 @@ typedef struct
|
||||
|
||||
extern std::map<LLUUID, LLSoundHistoryItem> gSoundHistory;
|
||||
|
||||
static void logSoundPlay(LLUUID id, LLAudioSource* audio_source, LLVector3d position, S32 type, LLUUID assetid, LLUUID ownerid, LLUUID sourceid, bool is_trigger, bool is_looped);
|
||||
static void logSoundStop(LLUUID id);
|
||||
static void pruneSoundLog();
|
||||
static int gSoundHistoryPruneCounter;
|
||||
extern void logSoundPlay(LLUUID id, LLAudioSource* audio_source, LLVector3d position, S32 type, LLUUID assetid, LLUUID ownerid, LLUUID sourceid, bool is_trigger, bool is_looped);
|
||||
extern void logSoundStop(LLUUID id);
|
||||
extern void pruneSoundLog();
|
||||
extern int gSoundHistoryPruneCounter;
|
||||
|
||||
// </edit>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user