diff options
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/lldatapacker.cpp | 6 | ||||
| -rw-r--r-- | indra/llmessage/llpartdata.cpp | 5 | ||||
| -rw-r--r-- | indra/llmessage/llthrottle.cpp | 2 | 
3 files changed, 3 insertions, 10 deletions
| diff --git a/indra/llmessage/lldatapacker.cpp b/indra/llmessage/lldatapacker.cpp index 96c1297e0d..b6adc102d2 100644 --- a/indra/llmessage/lldatapacker.cpp +++ b/indra/llmessage/lldatapacker.cpp @@ -127,13 +127,7 @@ BOOL LLDataPacker::unpackFixed(F32 &value, const char *name,  		total_bits++;  	} -	S32 min_val;  	U32 max_val; -	if (is_signed) -	{ -		min_val = 1 << int_bits; -		min_val *= -1; -	}  	max_val = 1 << int_bits;  	F32 fixed_val; diff --git a/indra/llmessage/llpartdata.cpp b/indra/llmessage/llpartdata.cpp index 53aa35c0f9..6664eb02dc 100644 --- a/indra/llmessage/llpartdata.cpp +++ b/indra/llmessage/llpartdata.cpp @@ -311,8 +311,9 @@ BOOL LLPartSysData::unpack(LLDataPacker &dp)  std::ostream& operator<<(std::ostream& s, const LLPartSysData &data)  {  	s << "Flags: " << std::hex << data.mFlags; -	s << " Pattern: " << std::hex << (U32) data.mPattern << "\n"; -	s << "Age: [" << data.mStartAge << ", " << data.mMaxAge << "]\n"; +	s << "Pattern: " << std::hex << (U32) data.mPattern << "\n"; +	s << "Source Age: [" << data.mStartAge << ", " << data.mMaxAge << "]\n"; +    s << "Particle Age: " << data.mPartData.mMaxAge << "\n";  	s << "Angle: [" << data.mInnerAngle << ", " << data.mOuterAngle << "]\n";  	s << "Burst Rate: " << data.mBurstRate << "\n";  	s << "Burst Radius: " << data.mBurstRadius << "\n"; diff --git a/indra/llmessage/llthrottle.cpp b/indra/llmessage/llthrottle.cpp index 7605da4d3f..935af2aa5a 100644 --- a/indra/llmessage/llthrottle.cpp +++ b/indra/llmessage/llthrottle.cpp @@ -374,7 +374,6 @@ BOOL LLThrottleGroup::dynamicAdjust()  	}  	mDynamicAdjustTime = mt_sec; -	S32 total = 0;  	// Update historical information  	for (i = 0; i < TC_EOF; i++)  	{ @@ -391,7 +390,6 @@ BOOL LLThrottleGroup::dynamicAdjust()  		}  		mBitsSentThisPeriod[i] = 0; -		total += ll_round(mBitsSentHistory[i]);  	}  	// Look for busy channels | 
