From 863195612bdef56165f2b4354bab280c371618b9 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 27 Sep 2007 14:57:43 +0000
Subject: Reverting back to 2017 since 2018 were causing Linux breakage;
 reopening Tleiades patch 444 and 445.

---
 OpenSim/Framework/General/Types/UUID.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/General/Types/UUID.cs')

diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs
index feae4ae..9e9654d 100644
--- a/OpenSim/Framework/General/Types/UUID.cs
+++ b/OpenSim/Framework/General/Types/UUID.cs
@@ -91,12 +91,12 @@ namespace OpenSim.Framework.Types
 
         public void Combine(UUID other)
         {
-            LLUUID.Combine(llUUID, other.GetLLUUID());
+            llUUID.Combine(other.GetLLUUID());
         }
 
         public void Combine(LLUUID other)
         {
-            LLUUID.Combine(llUUID, other);
+            llUUID.Combine(other);
         }
 
         public override bool Equals(Object other)
-- 
cgit v1.1