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 | |
parent | DNE code cleanups (diff) | |
download | opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 457142f..e805001 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Grid.AssetServer | |||
70 | 70 | ||
71 | if (p.Length > 0) | 71 | if (p.Length > 0) |
72 | { | 72 | { |
73 | UUID assetID = null; | 73 | UUID assetID = UUID.Zero; |
74 | 74 | ||
75 | if (!UUID.TryParse(p[0], out assetID)) | 75 | if (!UUID.TryParse(p[0], out assetID)) |
76 | { | 76 | { |
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index b437f59..05e70db 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -614,7 +614,7 @@ namespace OpenSim.Grid.GridServer | |||
614 | // | 614 | // |
615 | // this particular section of the mod attempts to receive a value from the region's xml file by way of | 615 | // this particular section of the mod attempts to receive a value from the region's xml file by way of |
616 | // OSG1GridServices for the region's owner | 616 | // OSG1GridServices for the region's owner |
617 | sim.owner_uuid = (string)requestData["master_avatar_uuid"]; | 617 | sim.owner_uuid = (UUID)(string)requestData["master_avatar_uuid"]; |
618 | 618 | ||
619 | try | 619 | try |
620 | { | 620 | { |
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 | { |