From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 30 Jul 2009 23:22:41 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 --- indra/newview/llpanelpicks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelpicks.h') diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h index 3bc79daeb3..e0e7f69532 100644 --- a/indra/newview/llpanelpicks.h +++ b/indra/newview/llpanelpicks.h @@ -102,7 +102,7 @@ private: bool callbackTeleport(const LLSD& notification, const LLSD& response); void reshapePicksList(); - void reshapePickItem(LLView* const pick_item, const S32 last_bottom); + void reshapePickItem(LLView* const pick_item, const S32 last_bottom, const S32 newWidth); LLView* getPicksList() const; void updateButtons(); -- cgit v1.2.3