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

Blah blah fix non-windows builds.

Browse Source
This commit is contained in:
Shyotl
2013-06-04 17:08:59 -05:00
parent 3a7955192e
commit 909fc0d9ce
3 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llaudio/llaudioengine_fmodex.cpp
View File

@@ -55,8 +55,6 @@
#include <DelayImp.h> #include <DelayImp.h>
#pragma comment(lib, "delayimp.lib") #pragma comment(lib, "delayimp.lib")
static bool sVerboseDebugging = false;
bool attemptDelayLoad() bool attemptDelayLoad()
{ {
__try __try
@@ -72,6 +70,8 @@ bool attemptDelayLoad()
} }
#endif #endif
static bool sVerboseDebugging = false;
FMOD_RESULT F_CALLBACK windCallback(FMOD_DSP_STATE *dsp_state, float *inbuffer, float *outbuffer, unsigned int length, int inchannels, int outchannels); FMOD_RESULT F_CALLBACK windCallback(FMOD_DSP_STATE *dsp_state, float *inbuffer, float *outbuffer, unsigned int length, int inchannels, int outchannels);
FMOD::ChannelGroup *LLAudioEngine_FMODEX::mChannelGroups[LLAudioEngine::AUDIO_TYPE_COUNT] = {0}; FMOD::ChannelGroup *LLAudioEngine_FMODEX::mChannelGroups[LLAudioEngine::AUDIO_TYPE_COUNT] = {0};
@@ -171,7 +171,7 @@ public:
llcont << llendl; llcont << llendl;
} }
mDeadSounds.insert(sound); mDeadSounds.insert(sound);
mActiveSounds.erase(it); mActiveSounds.erase(sound);
} }
} }
void addNewChannelToSound(FMOD::Sound* sound,FMOD::Channel* channel) void addNewChannelToSound(FMOD::Sound* sound,FMOD::Channel* channel)
@@ -206,7 +206,7 @@ public:
it2->second.erase(channel); it2->second.erase(channel);
} }
mDeadChannels.insert(*it); mDeadChannels.insert(*it);
mActiveChannels.erase(it); mActiveChannels.erase(channel);
} }
} }
} gSoundCheck; } gSoundCheck;

24
indra/newview/llfloaterobjectiminfo.cpp
View File

@@ -56,30 +56,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// LLFloaterObjectIMInfo // LLFloaterObjectIMInfo
class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
{
public:
LLFloaterObjectIMInfo(const LLSD& sd);
virtual ~LLFloaterObjectIMInfo() { };
BOOL postBuild(void);
void update(LLSD& payload);
// UI Handlers
static void onClickMap(void* data);
static void onClickOwner(void* data);
static void onClickMute(void* data);
void nameCallback(const LLUUID& id, const std::string& full_name, bool is_group);
private:
LLUUID mObjectID;
LLUUID mOwnerID;
std::string mSLurl;
std::string mName;
bool mGroupOwned;
};
LLFloaterObjectIMInfo::LLFloaterObjectIMInfo(const LLSD& seed) LLFloaterObjectIMInfo::LLFloaterObjectIMInfo(const LLSD& seed)
: mObjectID(), mName(), mSLurl(), mOwnerID(), mGroupOwned(false) : mObjectID(), mName(), mSLurl(), mOwnerID(), mGroupOwned(false)

31
indra/newview/llfloaterobjectiminfo.h
View File

@@ -33,14 +33,31 @@
#ifndef LL_LLFLOATEROBJECTIMINFO_H #ifndef LL_LLFLOATEROBJECTIMINFO_H
#define LL_LLFLOATEROBJECTIMINFO_H #define LL_LLFLOATEROBJECTIMINFO_H
namespace LLObjectIMInfo #include "llfloater.h"
class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
{ {
// Show an LLFloaterObjectIMInfo for this object. public:
static void show(const LLUUID& object_id, LLFloaterObjectIMInfo(const LLSD& sd);
const std::string& name, virtual ~LLFloaterObjectIMInfo() { };
const std::string& location,
const LLUUID& owner_id, /*virtual*/ BOOL postBuild(void);
bool owner_is_group);
void update(LLSD& payload);
// UI Handlers
static void onClickMap(void* data);
static void onClickOwner(void* data);
static void onClickMute(void* data);
void nameCallback(const LLUUID& id, const std::string& full_name, bool is_group);
private:
LLUUID mObjectID;
LLUUID mOwnerID;
std::string mSLurl;
std::string mName;
bool mGroupOwned;
}; };
#endif // LL_LLFLOATERURLDISPLAY_H #endif // LL_LLFLOATERURLDISPLAY_H