Second Life viewer sources 1.19.0.0

1 files changed, 19 insertions, 3 deletions

diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index 69bfaa7..d081245 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -183,7 +183,15 @@ template <class LLDATATYPE>
 inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3)
 {
         LLDATATYPE r = llmax(d1,d2);
-        return (r > d3 ? r : d3);
+        return llmax(r, d3);
+}
+
+template <class LLDATATYPE> 
+inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3, const LLDATATYPE& d4)
+{
+        LLDATATYPE r1 = llmax(d1,d2);
+        LLDATATYPE r2 = llmax(d3,d4);
+        return llmax(r1, r2);
 }
 
 template <class LLDATATYPE> 
@@ -200,6 +208,14 @@ inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATA
 }
 
 template <class LLDATATYPE> 
+inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3, const LLDATATYPE& d4)
+{
+        LLDATATYPE r1 = llmin(d1,d2);
+        LLDATATYPE r2 = llmin(d3,d4);
+        return llmin(r1, r2);
+}
+
+template <class LLDATATYPE> 
 inline LLDATATYPE llclamp(const LLDATATYPE& a, const LLDATATYPE& minval, const LLDATATYPE& maxval)
 {
         return llmin(llmax(a, minval), maxval);