From e5124431b54d4342d4677371fccca5bc7250c079 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 2 Jul 2007 17:10:30 +0000
Subject: svn merge -r 64079:64548
 svn+ssh://svn/svn/linden/branches/maintenance into release

---
 indra/newview/llfloatertopobjects.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index 071e0bc5cd..e27955c324 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -24,7 +24,7 @@ public:
 	static void handle_land_reply(LLMessageSystem* msg, void** data);
 	void handleReply(LLMessageSystem* msg, void** data);
 	
-	void clearList();
+	static void clearList();
 	void updateSelectionInfo();
 	virtual BOOL postBuild();
 
-- 
cgit v1.2.3