diff options
| author | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
| commit | 0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llmath/v4coloru.cpp | |
| parent | Imprudence 1.1.0 released. (diff) | |
| parent | Updated Imprudence to be based on SL 1.22.11. (ChangeLog Entry) (diff) | |
| download | meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.zip meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.gz meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.bz2 meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.xz | |
Merge branch 'sl-base-1.22' into next
Conflicts:
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
Diffstat (limited to 'linden/indra/llmath/v4coloru.cpp')
| -rw-r--r-- | linden/indra/llmath/v4coloru.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llmath/v4coloru.cpp b/linden/indra/llmath/v4coloru.cpp index 7ad7eb2..b127a53 100644 --- a/linden/indra/llmath/v4coloru.cpp +++ b/linden/indra/llmath/v4coloru.cpp | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -120,6 +120,6 @@ BOOL LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value) | |||
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | value->setVec( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) ); | 123 | value->set( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) ); |
| 124 | return TRUE; | 124 | return TRUE; |
| 125 | } | 125 | } |