From 934e15973ea86e0e863123d4c5eabeae44d6c763 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 31 Jan 2007 19:36:32 +0000
Subject: merge release@57486 release-candidate@57503

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

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

diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 0cdcdf938b..713750ad06 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -36,7 +36,6 @@ class LLWebBrowserCtrl;
 
 enum EOnlineStatus
 {
-	ONLINE_STATUS_UNKNOWN = -1,
 	ONLINE_STATUS_NO      = 0,
 	ONLINE_STATUS_YES     = 1
 };
@@ -243,6 +242,8 @@ public:
 	// Pass one of the ONLINE_STATUS_foo constants above.
 	void setAvatarID(const LLUUID &avatar_id, const LLString &name, EOnlineStatus online_status);
 
+	void setOnlineStatus(EOnlineStatus online_status);
+
 	const LLUUID& getAvatarID() const { return mAvatarID; }
 
 	void disableRate();
-- 
cgit v1.2.3