From 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 17 Jan 2007 23:02:00 +0000
Subject: merge release@56803 release-candidate@56833

---
 indra/newview/llselectmgr.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llselectmgr.h')

diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 77039213d4..77c1206b89 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -166,6 +166,7 @@ public:
 	static LLColor4				sSilhouetteChildColor;
 	static LLColor4				sHighlightParentColor;
 	static LLColor4				sHighlightChildColor;
+	static LLColor4				sHighlightInspectColor;
 	static LLColor4				sContextSilhouetteColor;
 public:
 	LLSelectMgr();
@@ -605,6 +606,7 @@ public:
 	LLUUID			mFromTaskID;
 	LLString		mTouchName;
 	LLString		mSitName;
+	U64				mCreationDate;
 	std::vector<LLColor4>	mSavedColors;
 	std::vector<LLUUID>		mSavedTextures;
 	std::vector<LLVector3>  mTextureScaleRatios;
-- 
cgit v1.3