diff options
author | lbsa71 | 2007-09-27 13:25:45 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-27 13:25:45 +0000 |
commit | 8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch) | |
tree | ae67873a5f801b2b7bdf9a7b088db98beb97b5ac /OpenSim/Framework/General/Types/UUID.cs | |
parent | Terrain: (diff) | |
download | opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2 opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz |
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'OpenSim/Framework/General/Types/UUID.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/UUID.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs index 9e9654d..feae4ae 100644 --- a/OpenSim/Framework/General/Types/UUID.cs +++ b/OpenSim/Framework/General/Types/UUID.cs | |||
@@ -91,12 +91,12 @@ namespace OpenSim.Framework.Types | |||
91 | 91 | ||
92 | public void Combine(UUID other) | 92 | public void Combine(UUID other) |
93 | { | 93 | { |
94 | llUUID.Combine(other.GetLLUUID()); | 94 | LLUUID.Combine(llUUID, other.GetLLUUID()); |
95 | } | 95 | } |
96 | 96 | ||
97 | public void Combine(LLUUID other) | 97 | public void Combine(LLUUID other) |
98 | { | 98 | { |
99 | llUUID.Combine(other); | 99 | LLUUID.Combine(llUUID, other); |
100 | } | 100 | } |
101 | 101 | ||
102 | public override bool Equals(Object other) | 102 | public override bool Equals(Object other) |