From 222bca24c12e162669c1a810c3102811f21cfbe4 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Fri, 5 Sep 2008 22:03:35 +0000
Subject: svn merge -r95288:95907
 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 this is a
 combined mergeback of the following branches as per QAR-841:  
 maint-server/maint-server-1 (absorbed by maint-server-2)  
 maint-server/maint-server-2   maint-server/maint-server-3   havok4/havok4-8  
 havok4/havok4-9

yes dataserver-is-deprecated
---
 indra/llmath/v4coloru.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llmath/v4coloru.cpp')

diff --git a/indra/llmath/v4coloru.cpp b/indra/llmath/v4coloru.cpp
index 26f3804209..17a198b392 100644
--- a/indra/llmath/v4coloru.cpp
+++ b/indra/llmath/v4coloru.cpp
@@ -120,6 +120,6 @@ BOOL LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value)
 		}
 	}
 
-	value->setVec( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) );
+	value->set( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) );
 	return TRUE;
 }
-- 
cgit v1.3