diff options
author | MW | 2007-04-17 12:03:52 +0000 |
---|---|---|
committer | MW | 2007-04-17 12:03:52 +0000 |
commit | d5406fe77309770234524f6afa38ae1502f01eab (patch) | |
tree | 1eacbc4c4f803087b7a2df77c43e8de65d91dbf2 /OpenSim.RegionServer/world/Avatar.cs | |
parent | Created skeleton SimComms.cs for sim<->sim UDP circuits (diff) | |
download | opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.zip opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.tar.gz opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.tar.bz2 opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.tar.xz |
A few fixes and stopped sim crossing being attempted in sandbox mode
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/world/Avatar.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs index b6b8282..54043fc 100644 --- a/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim.RegionServer/world/Avatar.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.world | |||
44 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)"); | 44 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)"); |
45 | ControllingClient = TheClient; | 45 | ControllingClient = TheClient; |
46 | localid = 8880000 + (this.m_world._localNumber++); | 46 | localid = 8880000 + (this.m_world._localNumber++); |
47 | Pos = ControllingClient.startpos; | 47 | Pos = ControllingClient.startpos; |
48 | visualParams = new byte[218]; | 48 | visualParams = new byte[218]; |
49 | for (int i = 0; i < 218; i++) | 49 | for (int i = 0; i < 218; i++) |
50 | { | 50 | { |
@@ -59,7 +59,7 @@ namespace OpenSim.world | |||
59 | this.Wearables[0].ItemID = LLUUID.Random(); | 59 | this.Wearables[0].ItemID = LLUUID.Random(); |
60 | 60 | ||
61 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | 61 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); |
62 | 62 | ||
63 | } | 63 | } |
64 | 64 | ||
65 | public PhysicsActor PhysActor | 65 | public PhysicsActor PhysActor |
@@ -307,7 +307,7 @@ namespace OpenSim.world | |||
307 | handshake.RegionInfo.TerrainStartHeight11 = 10; | 307 | handshake.RegionInfo.TerrainStartHeight11 = 10; |
308 | handshake.RegionInfo.SimAccess = 13; | 308 | handshake.RegionInfo.SimAccess = 13; |
309 | handshake.RegionInfo.WaterHeight = 20; | 309 | handshake.RegionInfo.WaterHeight = 20; |
310 | handshake.RegionInfo.RegionFlags = 72458694 -32; | 310 | handshake.RegionInfo.RegionFlags = 72458694 - 32; |
311 | handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); | 311 | handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); |
312 | handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); | 312 | handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); |
313 | handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); | 313 | handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); |