Made compiler detection more reliable and cleanup clang warnings
This commit is contained in:
@@ -252,7 +252,6 @@ private:
|
||||
LLButton* mUploadBtn;
|
||||
|
||||
LLScrollListCtrl* mBitmapList;
|
||||
LLScrollListCtrl* mUsedList;
|
||||
LLTextureCtrl* mTextureView;
|
||||
LLCheckBoxCtrl* mUpdateChkBox;
|
||||
|
||||
|
||||
@@ -57,7 +57,6 @@ extern AIHTTPTimeoutPolicy iamHereVoice_timeout;
|
||||
|
||||
FloaterVoiceLicense::FloaterVoiceLicense(const LLSD& key)
|
||||
: LLModalDialog( std::string(" "), 100, 100 ),
|
||||
mWebBrowserWindowId( 0 ),
|
||||
mLoadCompleteCount( 0 )
|
||||
{
|
||||
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_voice_license.xml");
|
||||
|
||||
@@ -66,7 +66,6 @@ public:
|
||||
/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
|
||||
|
||||
private:
|
||||
int mWebBrowserWindowId;
|
||||
int mLoadCompleteCount;
|
||||
};
|
||||
|
||||
|
||||
@@ -910,7 +910,6 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction)
|
||||
}
|
||||
|
||||
|
||||
LLVector3d camera_offset(mCameraFocusOffsetTarget);
|
||||
LLVector3d camera_offset_unit(mCameraFocusOffsetTarget);
|
||||
F32 min_zoom = 0.f;//LAND_MIN_ZOOM;
|
||||
F32 current_distance = (F32)camera_offset_unit.normalize();
|
||||
@@ -988,7 +987,6 @@ void LLAgentCamera::cameraOrbitIn(const F32 meters)
|
||||
}
|
||||
else
|
||||
{
|
||||
LLVector3d camera_offset(mCameraFocusOffsetTarget);
|
||||
LLVector3d camera_offset_unit(mCameraFocusOffsetTarget);
|
||||
F32 current_distance = (F32)camera_offset_unit.normalize();
|
||||
F32 new_distance = current_distance - meters;
|
||||
|
||||
@@ -1052,8 +1052,6 @@ void LLSpeakerMgr::update(BOOL resort_ok)
|
||||
LLUUID speaker_id = speaker_it->first;
|
||||
LLSpeaker* speakerp = speaker_it->second;
|
||||
|
||||
speaker_map_t::iterator cur_speaker_it = speaker_it++;
|
||||
|
||||
if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
|
||||
{
|
||||
speakerp->mSpeechVolume = gVoiceClient->getCurrentPower(speaker_id);
|
||||
|
||||
@@ -91,18 +91,12 @@ private:
|
||||
void doCheckUncheckAll(BOOL check);
|
||||
|
||||
private:
|
||||
// UI
|
||||
LLScrollListCtrl* mMessages;
|
||||
LLButton* mCloseBtn;
|
||||
|
||||
// Object Queue
|
||||
LLDynamicArray<LLUUID> mObjectIDs;
|
||||
LLUUID mCurrentObjectID;
|
||||
BOOL mDone;
|
||||
|
||||
LLUUID mID;
|
||||
|
||||
const char* mStartString;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -85,7 +85,6 @@ LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
|
||||
: LLModalDialog( std::string(" "), 100, 100 ),
|
||||
mType(type),
|
||||
mMessage(message),
|
||||
mWebBrowserWindowId( 0 ),
|
||||
mLoadCompleteCount( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
@@ -80,7 +80,6 @@ private:
|
||||
private:
|
||||
ETOSType mType;
|
||||
std::string mMessage;
|
||||
int mWebBrowserWindowId;
|
||||
int mLoadCompleteCount;
|
||||
|
||||
static LLFloaterTOS* sInstance;
|
||||
|
||||
@@ -2614,7 +2614,6 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
|
||||
if(drop && accept)
|
||||
{
|
||||
it = inventory_objects.begin();
|
||||
LLInventoryObject::object_list_t::iterator first_it = inventory_objects.begin();
|
||||
LLMoveInv* move_inv = new LLMoveInv;
|
||||
move_inv->mObjectID = object_id;
|
||||
move_inv->mCategoryID = category_id;
|
||||
|
||||
Reference in New Issue
Block a user