From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 26 Jun 2008 00:39:00 +0000 Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated --- indra/newview/llnetmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 5d506c473c..3950a08166 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -55,7 +55,7 @@ public: virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask ); virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); - virtual BOOL handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen ); + virtual BOOL handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen ); void setScale( F32 scale ); void translatePan( F32 delta_x, F32 delta_y ); -- cgit v1.2.3