From 215f423cbe18fe9ca14a26caef918d303bad28ff Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:11 -0500
Subject: Second Life viewer sources 1.18.4.0-RC

---
 linden/indra/llui/llmenugl.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'linden/indra/llui/llmenugl.h')

diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 6051a26..6dc9282 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -2,6 +2,8 @@
  * @file llmenugl.h
  * @brief Declaration of the opengl based menu system.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLMENUGL_H
@@ -124,8 +127,8 @@ public:
 	LLString getLabel( void ) const { return mLabel.getString(); }
 
 	// change the label
-	void setLabel( const LLString& label );
-	virtual BOOL setLabelArg( const LLString& key, const LLString& text );
+	void setLabel( const LLStringExplicit& label );
+	virtual BOOL setLabelArg( const LLString& key, const LLStringExplicit& text );
 
 	// Get the parent menu for this item
 	virtual LLMenuGL*	getMenu();
@@ -440,7 +443,7 @@ public:
 
 	// return the name label
 	const LLString& getLabel( void ) const { return mLabel.getString(); }
-	void setLabel(const LLString& label) { mLabel = label; }
+	void setLabel(const LLStringExplicit& label) { mLabel = label; }
 
 	static void setDefaultBackgroundColor( const LLColor4& color );
 	void setBackgroundColor( const LLColor4& color );
-- 
cgit v1.1