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

Small changes that seem to make clang happier.

Browse Source
This commit is contained in:
Lirusaito
2012-04-30 23:48:30 -04:00
parent a82953d0d0
commit e20b383aa0
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llscrolllistctrl.cpp
View File

@@ -2372,7 +2372,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask )
if (mCanSelect) if (mCanSelect)
{ {
// Ignore capslock // Ignore capslock
mask = mask; //mask = mask; //Why was this here?
if (mask == MASK_NONE) if (mask == MASK_NONE)
{ {

2
indra/newview/llface.cpp
View File

@@ -1791,7 +1791,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
(glow << 24); (glow << 24);
U32 vec[4]; U32 vec[4];
vec[0] = vec[1] = vec[2] = vec[3] = glow32; std::fill_n(vec,4,glow32);
src.loadua((F32*) vec); src.loadua((F32*) vec);

2
indra/newview/llinventorybridge.h
View File

@@ -178,6 +178,7 @@ class AIFilePicker;
class LLInventoryFVBridgeBuilder class LLInventoryFVBridgeBuilder
{ {
public: public:
LLInventoryFVBridgeBuilder() {}
virtual ~LLInventoryFVBridgeBuilder() {} virtual ~LLInventoryFVBridgeBuilder() {}
virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type, virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type,
LLAssetType::EType actual_asset_type, LLAssetType::EType actual_asset_type,
@@ -627,6 +628,7 @@ public:
class LLRecentInventoryBridgeBuilder : public LLInventoryFVBridgeBuilder class LLRecentInventoryBridgeBuilder : public LLInventoryFVBridgeBuilder
{ {
public: public:
LLRecentInventoryBridgeBuilder(): LLInventoryFVBridgeBuilder() {}
// Overrides FolderBridge for Recent Inventory Panel. // Overrides FolderBridge for Recent Inventory Panel.
// It use base functionality for bridges other than FolderBridge. // It use base functionality for bridges other than FolderBridge.
virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type, virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type,

2
indra/newview/llviewermenu.cpp
View File

@@ -9067,7 +9067,7 @@ class LLEditTakeOff : public view_listener_t
&& (gAgentWearables.getWearableCount(type) > 0)) && (gAgentWearables.getWearableCount(type) > 0))
{ {
// MULTI-WEARABLES: assuming user wanted to remove top shirt. // 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 // [RLVa:KB] - Checked: 2010-06-09 (RLVa-1.2.0g) | Added: RLVa-1.2.0g
if ( (rlv_handler_t::isEnabled()) && (gRlvWearableLocks.hasLockedWearable(type)) ) if ( (rlv_handler_t::isEnabled()) && (gRlvWearableLocks.hasLockedWearable(type)) )

2
indra/newview/llviewerregion.cpp
View File

@@ -1107,7 +1107,7 @@ public:
} }
else if( i != you_index) 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; U32 pos = 0x0;
pos |= x; pos |= x;
pos <<= 8; pos <<= 8;

2
indra/newview/llxmlrpctransaction.cpp
View File

@@ -469,7 +469,7 @@ void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code)
case CURLE_SSL_CACERT: case CURLE_SSL_CACERT:
case CURLE_SSL_CONNECT_ERROR: case CURLE_SSL_CONNECT_ERROR:
message = 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" "Please go to Control Panels and make sure the time and date\n"
"are set correctly.\n" "are set correctly.\n"
"\n" "\n"