diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-16 22:03:48 -0700 | 
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-16 22:03:48 -0700 | 
| commit | 3ed1bee350ed93f81a484a7c073c12708e73e946 (patch) | |
| tree | af2327ffcbf4d55ec45cfbf78ff6474659271b2c /indra | |
| parent | f740faf760cedec5b72928224b386c0dc8a3dd6e (diff) | |
trivial: convert to unix line endings.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerregion.h | 52 | 
1 files changed, 26 insertions, 26 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 4f0087ba7c..de14c0fe27 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -445,32 +445,32 @@ private:  	BOOL    mReleaseNotesRequested;  	BOOL    mDead;  //if true, this region is in the process of deleting. -	class CacheMissItem
 -	{
 -	public:
 -		CacheMissItem(U32 id, LLViewerRegion::eCacheMissType miss_type, F32 weight) : mID(id), mType(miss_type), mWeight(weight){}
 -
 -		U32                            mID;     //local object id
 -		LLViewerRegion::eCacheMissType mType;   //cache miss type
 -		F32                            mWeight; //importance of this object to the current camera.
 -	
 -		struct Compare
 -		{
 -			bool operator()(const CacheMissItem& lhs, const CacheMissItem& rhs)
 -			{
 -				if(lhs.mWeight == rhs.mWeight) //larger weight first
 -				{
 -					return &lhs < &rhs;
 -				}
 -				else 
 -				{
 -					return lhs.mWeight > rhs.mWeight; //larger weight first
 -				}
 -			}
 -		};
 -
 -		typedef std::set<CacheMissItem, Compare> cache_miss_list_t;
 -	};
 +	class CacheMissItem +	{ +	public: +		CacheMissItem(U32 id, LLViewerRegion::eCacheMissType miss_type, F32 weight) : mID(id), mType(miss_type), mWeight(weight){} + +		U32                            mID;     //local object id +		LLViewerRegion::eCacheMissType mType;   //cache miss type +		F32                            mWeight; //importance of this object to the current camera. +	 +		struct Compare +		{ +			bool operator()(const CacheMissItem& lhs, const CacheMissItem& rhs) +			{ +				if(lhs.mWeight == rhs.mWeight) //larger weight first +				{ +					return &lhs < &rhs; +				} +				else  +				{ +					return lhs.mWeight > rhs.mWeight; //larger weight first +				} +			} +		}; + +		typedef std::set<CacheMissItem, Compare> cache_miss_list_t; +	};  	CacheMissItem::cache_miss_list_t        mCacheMissList;  	caps_received_signal_t mCapabilitiesReceivedSignal;		  | 
