diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Grid/MessagingServer | |
parent | DNE code cleanups (diff) | |
download | opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs index 4d6f3de..7ea1ac7 100644 --- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs +++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer | |||
52 | 52 | ||
53 | public UUID getitem(int index) | 53 | public UUID getitem(int index) |
54 | { | 54 | { |
55 | UUID result = null; | 55 | UUID result = UUID.Zero; |
56 | lock (AgentList) | 56 | lock (AgentList) |
57 | { | 57 | { |
58 | if (index > 0 && index < AgentList.Count) | 58 | if (index > 0 && index < AgentList.Count) |
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index 3b433ba..9d3f2bf 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.MessagingServer | |||
63 | 63 | ||
64 | if (p.Length > 0) | 64 | if (p.Length > 0) |
65 | { | 65 | { |
66 | UUID assetID = null; | 66 | UUID assetID = UUID.Zero; |
67 | 67 | ||
68 | if (!UUID.TryParse(p[0], out assetID)) | 68 | if (!UUID.TryParse(p[0], out assetID)) |
69 | { | 69 | { |