diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 8f0cc0c64..e4ad47118 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -2372,7 +2372,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask ) if (mCanSelect) { // Ignore capslock - mask = mask; + //mask = mask; //Why was this here? if (mask == MASK_NONE) { diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f212da907..cd3c7812a 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1791,7 +1791,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, (glow << 24); U32 vec[4]; - vec[0] = vec[1] = vec[2] = vec[3] = glow32; + std::fill_n(vec,4,glow32); src.loadua((F32*) vec); diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 305d0649d..c3c883a42 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -178,6 +178,7 @@ class AIFilePicker; class LLInventoryFVBridgeBuilder { public: + LLInventoryFVBridgeBuilder() {} virtual ~LLInventoryFVBridgeBuilder() {} virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type, LLAssetType::EType actual_asset_type, @@ -627,6 +628,7 @@ public: class LLRecentInventoryBridgeBuilder : public LLInventoryFVBridgeBuilder { public: + LLRecentInventoryBridgeBuilder(): LLInventoryFVBridgeBuilder() {} // Overrides FolderBridge for Recent Inventory Panel. // It use base functionality for bridges other than FolderBridge. virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type, diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dc4fb0b5a..15162e938 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9067,7 +9067,7 @@ class LLEditTakeOff : public view_listener_t && (gAgentWearables.getWearableCount(type) > 0)) { // MULTI-WEARABLES: assuming user wanted to remove top shirt. - U32 wearable_index = gAgentWearables.getWearableCount(type) - 1; + S32 wearable_index = gAgentWearables.getWearableCount(type) - 1; // [RLVa:KB] - Checked: 2010-06-09 (RLVa-1.2.0g) | Added: RLVa-1.2.0g if ( (rlv_handler_t::isEnabled()) && (gRlvWearableLocks.hasLockedWearable(type)) ) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 48fb69023..2e96edcb4 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1107,7 +1107,7 @@ public: } else if( i != you_index) { - U32 loc = x << 16 | y << 8 | z; loc = loc; + //U32 loc = x << 16 | y << 8 | z; //Unused variable, why did this exist? U32 pos = 0x0; pos |= x; pos <<= 8; diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 159255078..af5e977b2 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -469,7 +469,7 @@ void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code) case CURLE_SSL_CACERT: case CURLE_SSL_CONNECT_ERROR: message = - "Often this means that your computer\'s clock is set incorrectly.\n" + "Often this means that your computer's clock is set incorrectly.\n" "Please go to Control Panels and make sure the time and date\n" "are set correctly.\n" "\n"