From 5cc44523f79b6cf495d2649fce9bf9e5181787e8 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Fri, 9 Feb 2007 23:35:12 +0000 Subject: Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. --- indra/llui/llscrolllistctrl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/llscrolllistctrl.cpp') diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index d263c25c72..2b7cbe5cef 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -76,7 +76,7 @@ protected: // LLScrollListIcon // LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) : -mIcon(icon), mImageUUID(image_id.getString()) +mIcon(icon), mImageUUID(image_id.asString()) { if (width) { -- cgit v1.2.3