diff options
| author | lbsa71 | 2007-09-27 14:57:43 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-09-27 14:57:43 +0000 |
| commit | 863195612bdef56165f2b4354bab280c371618b9 (patch) | |
| tree | 63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Framework/General/Types/UUID.cs | |
| parent | revert change to libsecondlife.dll.config which breaks Linux (diff) | |
| download | opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.zip opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.gz opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.bz2 opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.xz | |
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
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 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 | |||
| 91 | 91 | ||
| 92 | public void Combine(UUID other) | 92 | public void Combine(UUID other) |
| 93 | { | 93 | { |
| 94 | LLUUID.Combine(llUUID, other.GetLLUUID()); | 94 | llUUID.Combine(other.GetLLUUID()); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | public void Combine(LLUUID other) | 97 | public void Combine(LLUUID other) |
| 98 | { | 98 | { |
| 99 | LLUUID.Combine(llUUID, other); | 99 | llUUID.Combine(other); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | public override bool Equals(Object other) | 102 | public override bool Equals(Object other) |