From 16b6738cdadc70966a93b6d025ae469738955dcb Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 26 Sep 2008 17:25:22 +0000 Subject: * Patch from JHurliman * Updates to libomv r2243, * Remove lots of unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will update OpenSim-libs in 10 minutes.. --- .../RemoteController/RemoteAdminPlugin.cs | 10 ++-- .../Rest/Inventory/RestAppearanceServices.cs | 54 +++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'OpenSim/ApplicationPlugins') diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 1c924c0..6ffb8ec 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -206,7 +206,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController throw new Exception("wrong password"); string file = (string)requestData["filename"]; - UUID regionID = (string) requestData["regionid"]; + UUID regionID = (UUID)(string) requestData["regionid"]; m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); responseData["accepted"] = "true"; @@ -389,7 +389,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController if (requestData.ContainsKey("region_id") && !String.IsNullOrEmpty((string)requestData["region_id"])) { - regionID = (string)requestData["region_id"]; + regionID = (UUID)(string)requestData["region_id"]; if (m_app.SceneManager.TryGetScene(regionID, out scene)) throw new Exception(String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, @@ -810,7 +810,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController Scene scene = null; if (requestData.Contains("region_uuid")) { - UUID region_uuid = (string)requestData["region_uuid"]; + UUID region_uuid = (UUID)(string)requestData["region_uuid"]; if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); } @@ -870,7 +870,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController string filename = (string)requestData["filename"]; if (requestData.Contains("region_uuid")) { - UUID region_uuid = (string)requestData["region_uuid"]; + UUID region_uuid = (UUID)(string)requestData["region_uuid"]; if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); @@ -951,7 +951,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController string filename = (string)requestData["filename"]; if (requestData.Contains("region_uuid")) { - UUID region_uuid = (string)requestData["region_uuid"]; + UUID region_uuid = (UUID)(string)requestData["region_uuid"]; if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index a6d5b01..11a749c 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs @@ -494,7 +494,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory } if (xml.MoveToAttribute("Owner")) { - rdata.userAppearance.Owner = xml.Value; + rdata.userAppearance.Owner = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Serial")) @@ -506,156 +506,156 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory case "Body" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.BodyItem = xml.Value; + rdata.userAppearance.BodyItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.BodyAsset = xml.Value; + rdata.userAppearance.BodyAsset = (UUID)xml.Value; indata = true; } break; case "Skin" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.SkinItem = xml.Value; + rdata.userAppearance.SkinItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.SkinAsset = xml.Value; + rdata.userAppearance.SkinAsset = (UUID)xml.Value; indata = true; } break; case "Hair" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.HairItem = xml.Value; + rdata.userAppearance.HairItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.HairAsset = xml.Value; + rdata.userAppearance.HairAsset = (UUID)xml.Value; indata = true; } break; case "Eyes" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.EyesItem = xml.Value; + rdata.userAppearance.EyesItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.EyesAsset = xml.Value; + rdata.userAppearance.EyesAsset = (UUID)xml.Value; indata = true; } break; case "Shirt" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.ShirtItem = xml.Value; + rdata.userAppearance.ShirtItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.ShirtAsset = xml.Value; + rdata.userAppearance.ShirtAsset = (UUID)xml.Value; indata = true; } break; case "Pants" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.PantsItem = xml.Value; + rdata.userAppearance.PantsItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.PantsAsset = xml.Value; + rdata.userAppearance.PantsAsset = (UUID)xml.Value; indata = true; } break; case "Shoes" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.ShoesItem = xml.Value; + rdata.userAppearance.ShoesItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.ShoesAsset = xml.Value; + rdata.userAppearance.ShoesAsset = (UUID)xml.Value; indata = true; } break; case "Socks" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.SocksItem = xml.Value; + rdata.userAppearance.SocksItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.SocksAsset = xml.Value; + rdata.userAppearance.SocksAsset = (UUID)xml.Value; indata = true; } break; case "Jacket" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.JacketItem = xml.Value; + rdata.userAppearance.JacketItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.JacketAsset = xml.Value; + rdata.userAppearance.JacketAsset = (UUID)xml.Value; indata = true; } break; case "Gloves" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.GlovesItem = xml.Value; + rdata.userAppearance.GlovesItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.GlovesAsset = xml.Value; + rdata.userAppearance.GlovesAsset = (UUID)xml.Value; indata = true; } break; case "UnderShirt" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.UnderShirtItem = xml.Value; + rdata.userAppearance.UnderShirtItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.UnderShirtAsset = xml.Value; + rdata.userAppearance.UnderShirtAsset = (UUID)xml.Value; indata = true; } break; case "UnderPants" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.UnderPantsItem = xml.Value; + rdata.userAppearance.UnderPantsItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.UnderPantsAsset = xml.Value; + rdata.userAppearance.UnderPantsAsset = (UUID)xml.Value; indata = true; } break; case "Skirt" : if (xml.MoveToAttribute("Item")) { - rdata.userAppearance.SkirtItem = xml.Value; + rdata.userAppearance.SkirtItem = (UUID)xml.Value; indata = true; } if (xml.MoveToAttribute("Asset")) { - rdata.userAppearance.SkirtAsset = xml.Value; + rdata.userAppearance.SkirtAsset = (UUID)xml.Value; indata = true; } break; -- cgit v1.1