From aa2b978bf59dd74083bec86c61a29fefb4ebb14c Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Tue, 24 Feb 2009 19:29:36 +0000
Subject: merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to
 linden/trunk

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

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 6e3024908e..12d0fdf1e9 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -243,7 +243,7 @@ public:
 	void	setAllParcelFlags(U32 flags);
 	void	setParcelFlag(U32 flag, BOOL b);
 
-	void	setArea(S32 area, S32 sim_object_limit);
+	virtual void setArea(S32 area, S32 sim_object_limit);
 	void	setDiscountRate(F32 rate);
 
 	void	setAllowModify(BOOL b)	{ setParcelFlag(PF_CREATE_OBJECTS, b); }
-- 
cgit v1.3