aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp/MyWorld.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs25
1 files changed, 3 insertions, 22 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 3ba9c77..8e6fd8f 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -17,13 +17,11 @@ namespace SimpleApp
17{ 17{
18 public class MyWorld : Scene 18 public class MyWorld : Scene
19 { 19 {
20 private RegionInfo m_regionInfo;
21 private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars; 20 private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;
22 21
23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer) 23 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
25 { 24 {
26 m_regionInfo = regionInfo;
27 m_avatars = new List<Avatar>(); 25 m_avatars = new List<Avatar>();
28 } 26 }
29 27
@@ -68,12 +66,12 @@ namespace SimpleApp
68 66
69 client.OnCompleteMovementToRegion += delegate() 67 client.OnCompleteMovementToRegion += delegate()
70 { 68 {
71 client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero ); 69 client.MoveAgentIntoRegion(m_regInfo, pos, LLVector3.Zero );
72 }; 70 };
73 71
74 client.OnCompleteMovementToRegion += delegate() 72 client.OnCompleteMovementToRegion += delegate()
75 { 73 {
76 client.SendAvatarData(m_regionInfo.RegionHandle, client.FirstName, 74 client.SendAvatarData(m_regInfo.RegionHandle, client.FirstName,
77 client.LastName, client.AgentId, 0, 75 client.LastName, client.AgentId, 0,
78 pos, null); 76 pos, null);
79 77
@@ -83,7 +81,7 @@ namespace SimpleApp
83 81
84 }; 82 };
85 83
86 client.SendRegionHandshake(m_regionInfo); 84 client.SendRegionHandshake(m_regInfo);
87 85
88 CreateAndAddScenePresence(client); 86 CreateAndAddScenePresence(client);
89 87
@@ -94,23 +92,6 @@ namespace SimpleApp
94 client.SendWearables( AvatarWearable.DefaultWearables ); 92 client.SendWearables( AvatarWearable.DefaultWearables );
95 } 93 }
96 94
97 public RegionInfo RegionInfo
98 {
99 get { return m_regionInfo; }
100 }
101
102 public object SyncRoot
103 {
104 get { return this; }
105 }
106
107 private uint m_nextLocalId = 1;
108
109 public uint NextLocalId
110 {
111 get { return m_nextLocalId++; }
112 }
113
114 #endregion 95 #endregion
115 } 96 }
116} 97}