diff options
| author | Jeff Ames | 2008-03-19 09:36:13 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-03-19 09:36:13 +0000 |
| commit | a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f (patch) | |
| tree | be64babdd6f1bcb2a946d637b81739445facdd31 /OpenSim/Region/Environment/Modules | |
| parent | * Add a large amount of extra locking to m_parts in SceneObjectGroup (diff) | |
| download | opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.zip opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.gz opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.bz2 opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.xz | |
Fixed some comparisons of LLUUIDs to null.
Thanks to DrSchofld for pointing this out.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/XMLRPCModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index 67ebbf8..4f52ad6 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs | |||
| @@ -163,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules | |||
| 163 | 163 | ||
| 164 | public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID) | 164 | public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID) |
| 165 | { | 165 | { |
| 166 | LLUUID channel = null; | 166 | LLUUID channel = new LLUUID(); |
| 167 | 167 | ||
| 168 | //Is a dupe? | 168 | //Is a dupe? |
| 169 | foreach (RPCChannelInfo ci in m_openChannels.Values) | 169 | foreach (RPCChannelInfo ci in m_openChannels.Values) |
| @@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Modules | |||
| 176 | } | 176 | } |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | if ((channel.Equals(null)) || (channel.Equals(LLUUID.Zero))) | 179 | if (channel == LLUUID.Zero) |
| 180 | { | 180 | { |
| 181 | channel = LLUUID.Random(); | 181 | channel = LLUUID.Random(); |
| 182 | RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); | 182 | RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); |