OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* More cleaning - Sugilite now only has build errors for "value is never used" properties (which I presume will be filled in over time)

Sugilite
Adam Frisby 2007-07-04 05:49:12 +00:00
parent daf7b8ec76
commit 249ce4cf6f
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/General/Types/RegionHandle.cs
View File

@ -20,7 +20,10 @@ namespace OpenSim.Framework.Types
{ {
IPAddress addr = IPAddress.Parse(ip); IPAddress addr = IPAddress.Parse(ip);
long baseHandle = addr.Address; if (addr.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)
throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address");
uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0);
// Split the IP address in half // Split the IP address in half
short a = (short)((baseHandle << 16) & 0xFFFF); short a = (short)((baseHandle << 16) & 0xFFFF);

14
OpenSim/Region/Capabilities/Caps.cs
View File

@ -75,6 +75,7 @@ namespace OpenSim.Region.Capabilities
httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer); httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory); httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue); httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestTexture, RequestTexture);
} }
/// <summary> /// <summary>
@ -128,6 +129,19 @@ namespace OpenSim.Region.Capabilities
return res; return res;
} }
/// <summary>
///
/// </summary>
/// <param name="request"></param>
/// <param name="path"></param>
/// <param name="param"></param>
/// <returns></returns>
public string RequestTexture(string request, string path, string param)
{
// Needs implementing (added to remove compiler warning)
return "";
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

2
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -456,7 +456,7 @@ namespace OpenSim.Region.ClientStack
{ {
AssetLandmark lm = new AssetLandmark(lma); AssetLandmark lm = new AssetLandmark(lma);
if (lm.RegionID == m_regionData.SimUUID) if (lm.RegionID == m_world.RegionInfo.SimUUID)
{ {
TeleportLocalPacket tpLocal = new TeleportLocalPacket(); TeleportLocalPacket tpLocal = new TeleportLocalPacket();

1
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack
private AssetCache m_assetCache; private AssetCache m_assetCache;
private InventoryCache m_inventoryCache; private InventoryCache m_inventoryCache;
private int cachedtextureserial = 0; private int cachedtextureserial = 0;
private RegionInfo m_regionData;
protected AuthenticateSessionsBase m_authenticateSessionsHandler; protected AuthenticateSessionsBase m_authenticateSessionsHandler;
private Encoding enc = Encoding.ASCII; private Encoding enc = Encoding.ASCII;

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -200,7 +200,7 @@ namespace OpenSim.Region.Communications.OGS1
private void StartRemoting() private void StartRemoting()
{ {
TcpChannel ch = new TcpChannel(8895); TcpChannel ch = new TcpChannel(8895);
ChannelServices.RegisterChannel(ch); ChannelServices.RegisterChannel(ch, true);
WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton); WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
RemotingConfiguration.RegisterWellKnownServiceType(wellType); RemotingConfiguration.RegisterWellKnownServiceType(wellType);

2
OpenSim/Region/Environment/Scenes/SceneObject.cs
View File

@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
private Encoding enc = Encoding.ASCII; private Encoding enc = Encoding.ASCII;
private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group
public Primitive rootPrimitive; public Primitive rootPrimitive;
private Scene m_world; private new Scene m_world;
protected ulong m_regionHandle; protected ulong m_regionHandle;
private bool physicsEnabled = false; private bool physicsEnabled = false;