diff options
author | MW | 2007-06-27 15:03:54 +0000 |
---|---|---|
committer | MW | 2007-06-27 15:03:54 +0000 |
commit | 223550b7e4f9eb534728e7763642a2ba6154be96 (patch) | |
tree | cd6ebbefd3c06487f40c3c30b344d6c2fccb1df5 /OpenSim/OpenSim.Region | |
parent | * Begun reimplementing scripting. (diff) | |
download | opensim-SC-223550b7e4f9eb534728e7763642a2ba6154be96.zip opensim-SC-223550b7e4f9eb534728e7763642a2ba6154be96.tar.gz opensim-SC-223550b7e4f9eb534728e7763642a2ba6154be96.tar.bz2 opensim-SC-223550b7e4f9eb534728e7763642a2ba6154be96.tar.xz |
Some very Preliminary work on .net remoting for interregion comms.
a few more classes for CAPS LLSD types.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.Region/Caps.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/ScenePresence.cs | 5 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/UDPServer.cs | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs index 27d4828..13a351d 100644 --- a/OpenSim/OpenSim.Region/Caps.cs +++ b/OpenSim/OpenSim.Region/Caps.cs | |||
@@ -17,7 +17,6 @@ namespace OpenSim.Region | |||
17 | 17 | ||
18 | public class Caps | 18 | public class Caps |
19 | { | 19 | { |
20 | |||
21 | private string httpListenerAddress; | 20 | private string httpListenerAddress; |
22 | private uint httpListenPort; | 21 | private uint httpListenPort; |
23 | private string capsObjectPath = "00001-"; | 22 | private string capsObjectPath = "00001-"; |
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs index ffec3e5..45d3fed 100644 --- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs +++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs | |||
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Scenes | |||
99 | 99 | ||
100 | m_regionInfo = reginfo; | 100 | m_regionInfo = reginfo; |
101 | m_regionHandle = reginfo.RegionHandle; | 101 | m_regionHandle = reginfo.RegionHandle; |
102 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Avatar.cs - Loading details from grid (DUMMY)"); | 102 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs "); |
103 | ControllingClient = theClient; | 103 | ControllingClient = theClient; |
104 | this.firstname = ControllingClient.FirstName; | 104 | this.firstname = ControllingClient.FirstName; |
105 | this.lastname = ControllingClient.LastName; | 105 | this.lastname = ControllingClient.LastName; |
@@ -216,8 +216,7 @@ namespace OpenSim.Region.Scenes | |||
216 | /// </summary> | 216 | /// </summary> |
217 | /// <param name="pack"></param> | 217 | /// <param name="pack"></param> |
218 | public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) | 218 | public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) |
219 | { | 219 | { |
220 | |||
221 | if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0) | 220 | if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0) |
222 | { | 221 | { |
223 | Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); | 222 | Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); |
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs index fd16e93..68a140b 100644 --- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs +++ b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs | |||
@@ -41,7 +41,6 @@ using OpenSim.Terrain; | |||
41 | using OpenSim.Framework.Interfaces; | 41 | using OpenSim.Framework.Interfaces; |
42 | using OpenSim.Framework.Types; | 42 | using OpenSim.Framework.Types; |
43 | using OpenSim.Framework; | 43 | using OpenSim.Framework; |
44 | using OpenSim.UserServer; | ||
45 | using OpenSim.Assets; | 44 | using OpenSim.Assets; |
46 | using OpenSim.Caches; | 45 | using OpenSim.Caches; |
47 | using OpenSim.Framework.Console; | 46 | using OpenSim.Framework.Console; |
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs index 002e664..f2a02d9 100644 --- a/OpenSim/OpenSim.RegionServer/UDPServer.cs +++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs | |||
@@ -40,7 +40,6 @@ using libsecondlife.Packets; | |||
40 | using OpenSim.Terrain; | 40 | using OpenSim.Terrain; |
41 | using OpenSim.Framework.Interfaces; | 41 | using OpenSim.Framework.Interfaces; |
42 | using OpenSim.Framework.Types; | 42 | using OpenSim.Framework.Types; |
43 | using OpenSim.UserServer; | ||
44 | using OpenSim.Assets; | 43 | using OpenSim.Assets; |
45 | using OpenSim.Caches; | 44 | using OpenSim.Caches; |
46 | using OpenSim.Framework.Console; | 45 | using OpenSim.Framework.Console; |