diff options
author | Adam Frisby | 2007-07-04 05:49:12 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-04 05:49:12 +0000 |
commit | 249ce4cf6f353dd59ebec27689e74a527c39a090 (patch) | |
tree | 9f4a8da19e5aef1a12be5279459c40d96aa29f0d | |
parent | * Cleaning - attempting to get compiler warnings back down to zero. (diff) | |
download | opensim-SC-249ce4cf6f353dd59ebec27689e74a527c39a090.zip opensim-SC-249ce4cf6f353dd59ebec27689e74a527c39a090.tar.gz opensim-SC-249ce4cf6f353dd59ebec27689e74a527c39a090.tar.bz2 opensim-SC-249ce4cf6f353dd59ebec27689e74a527c39a090.tar.xz |
* More cleaning - Sugilite now only has build errors for "value is never used" properties (which I presume will be filled in over time)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Types/RegionHandle.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Capabilities/Caps.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObject.cs | 2 |
6 files changed, 21 insertions, 5 deletions
diff --git a/OpenSim/Framework/General/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs index 409b05a..4a055ad 100644 --- a/OpenSim/Framework/General/Types/RegionHandle.cs +++ b/OpenSim/Framework/General/Types/RegionHandle.cs | |||
@@ -20,7 +20,10 @@ namespace OpenSim.Framework.Types | |||
20 | { | 20 | { |
21 | IPAddress addr = IPAddress.Parse(ip); | 21 | IPAddress addr = IPAddress.Parse(ip); |
22 | 22 | ||
23 | long baseHandle = addr.Address; | 23 | if (addr.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork) |
24 | throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address"); | ||
25 | |||
26 | uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0); | ||
24 | 27 | ||
25 | // Split the IP address in half | 28 | // Split the IP address in half |
26 | short a = (short)((baseHandle << 16) & 0xFFFF); | 29 | short a = (short)((baseHandle << 16) & 0xFFFF); |
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs index d9d6f51..4a283b2 100644 --- a/OpenSim/Region/Capabilities/Caps.cs +++ b/OpenSim/Region/Capabilities/Caps.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Region.Capabilities | |||
75 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer); | 75 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer); |
76 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory); | 76 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory); |
77 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue); | 77 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue); |
78 | httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestTexture, RequestTexture); | ||
78 | } | 79 | } |
79 | 80 | ||
80 | /// <summary> | 81 | /// <summary> |
@@ -131,6 +132,19 @@ namespace OpenSim.Region.Capabilities | |||
131 | /// <summary> | 132 | /// <summary> |
132 | /// | 133 | /// |
133 | /// </summary> | 134 | /// </summary> |
135 | /// <param name="request"></param> | ||
136 | /// <param name="path"></param> | ||
137 | /// <param name="param"></param> | ||
138 | /// <returns></returns> | ||
139 | public string RequestTexture(string request, string path, string param) | ||
140 | { | ||
141 | // Needs implementing (added to remove compiler warning) | ||
142 | return ""; | ||
143 | } | ||
144 | |||
145 | /// <summary> | ||
146 | /// | ||
147 | /// </summary> | ||
134 | /// <returns></returns> | 148 | /// <returns></returns> |
135 | protected LLSDMapLayer BuildLLSDMapLayerResponse() | 149 | protected LLSDMapLayer BuildLLSDMapLayerResponse() |
136 | { | 150 | { |
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 7f961ef..64856ea 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -456,7 +456,7 @@ namespace OpenSim.Region.ClientStack | |||
456 | { | 456 | { |
457 | AssetLandmark lm = new AssetLandmark(lma); | 457 | AssetLandmark lm = new AssetLandmark(lma); |
458 | 458 | ||
459 | if (lm.RegionID == m_regionData.SimUUID) | 459 | if (lm.RegionID == m_world.RegionInfo.SimUUID) |
460 | { | 460 | { |
461 | TeleportLocalPacket tpLocal = new TeleportLocalPacket(); | 461 | TeleportLocalPacket tpLocal = new TeleportLocalPacket(); |
462 | 462 | ||
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 606ca1d..52749a1 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack | |||
75 | private AssetCache m_assetCache; | 75 | private AssetCache m_assetCache; |
76 | private InventoryCache m_inventoryCache; | 76 | private InventoryCache m_inventoryCache; |
77 | private int cachedtextureserial = 0; | 77 | private int cachedtextureserial = 0; |
78 | private RegionInfo m_regionData; | ||
79 | protected AuthenticateSessionsBase m_authenticateSessionsHandler; | 78 | protected AuthenticateSessionsBase m_authenticateSessionsHandler; |
80 | private Encoding enc = Encoding.ASCII; | 79 | private Encoding enc = Encoding.ASCII; |
81 | 80 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 5fff777..a11995a 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
200 | private void StartRemoting() | 200 | private void StartRemoting() |
201 | { | 201 | { |
202 | TcpChannel ch = new TcpChannel(8895); | 202 | TcpChannel ch = new TcpChannel(8895); |
203 | ChannelServices.RegisterChannel(ch); | 203 | ChannelServices.RegisterChannel(ch, true); |
204 | 204 | ||
205 | WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton); | 205 | WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton); |
206 | RemotingConfiguration.RegisterWellKnownServiceType(wellType); | 206 | RemotingConfiguration.RegisterWellKnownServiceType(wellType); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs index 3d97a06..9a46fbf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
39 | private Encoding enc = Encoding.ASCII; | 39 | private Encoding enc = Encoding.ASCII; |
40 | private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group | 40 | private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group |
41 | public Primitive rootPrimitive; | 41 | public Primitive rootPrimitive; |
42 | private Scene m_world; | 42 | private new Scene m_world; |
43 | protected ulong m_regionHandle; | 43 | protected ulong m_regionHandle; |
44 | 44 | ||
45 | private bool physicsEnabled = false; | 45 | private bool physicsEnabled = false; |