aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs9
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/SunModule.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs40
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs9
6 files changed, 19 insertions, 50 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d94a890..5dc11ad 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Framework
48 48
49 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 49 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
50 { 50 {
51
52 m_regionLocX = regionLocX; 51 m_regionLocX = regionLocX;
53 m_regionLocY = regionLocY; 52 m_regionLocY = regionLocY;
54 53
@@ -83,7 +82,6 @@ namespace OpenSim.Framework
83 82
84 public string RemotingAddress; 83 public string RemotingAddress;
85 84
86
87 public IPEndPoint ExternalEndPoint 85 public IPEndPoint ExternalEndPoint
88 { 86 {
89 get 87 get
@@ -99,7 +97,6 @@ namespace OpenSim.Framework
99 // Reset for next check 97 // Reset for next check
100 ia = null; 98 ia = null;
101 99
102
103 // New method favors IPv4 100 // New method favors IPv4
104 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) 101 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
105 { 102 {
@@ -111,7 +108,6 @@ namespace OpenSim.Framework
111 ia = Adr; 108 ia = Adr;
112 break; 109 break;
113 } 110 }
114
115 } 111 }
116 112
117 return new IPEndPoint(ia, m_internalEndPoint.Port); 113 return new IPEndPoint(ia, m_internalEndPoint.Port);
@@ -209,10 +205,10 @@ namespace OpenSim.Framework
209 205
210 return m_estateSettings; 206 return m_estateSettings;
211 } 207 }
212
213 } 208 }
214 209
215 public ConfigurationMember configMember; 210 public ConfigurationMember configMember;
211
216 public RegionInfo(string description, string filename) 212 public RegionInfo(string description, string filename)
217 { 213 {
218 configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 214 configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
@@ -226,13 +222,10 @@ namespace OpenSim.Framework
226 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) : 222 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) :
227 base(regionLocX, regionLocY, internalEndPoint, externalUri) 223 base(regionLocX, regionLocY, internalEndPoint, externalUri)
228 { 224 {
229
230
231 } 225 }
232 226
233 public RegionInfo() 227 public RegionInfo()
234 { 228 {
235
236 } 229 }
237 public RegionInfo(SearializableRegionInfo ConvertFrom) 230 public RegionInfo(SearializableRegionInfo ConvertFrom)
238 { 231 {
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 7179a7f..068c7c4 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -39,6 +39,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
39 public void SetIniConfigSource(IniConfigSource configSource) 39 public void SetIniConfigSource(IniConfigSource configSource)
40 { 40 {
41 } 41 }
42
42 public RegionInfo[] LoadRegions() 43 public RegionInfo[] LoadRegions()
43 { 44 {
44 string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); 45 string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
@@ -59,14 +60,11 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
59 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; 60 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
60 for (int i = 0; i < configFiles.Length; i++) 61 for (int i = 0; i < configFiles.Length; i++)
61 { 62 {
62
63 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); 63 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]);
64 regionInfos[i] = regionInfo; 64 regionInfos[i] = regionInfo;
65 } 65 }
66 66
67
68 return regionInfos; 67 return regionInfos;
69 } 68 }
70
71 } 69 }
72} 70}
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 64fe8df..d8100c0 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -626,7 +626,7 @@ namespace OpenSim
626 m_log.Error(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); 626 m_log.Error(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
627 m_log.Error(" alert general [Message] - send an alert to all users."); 627 m_log.Error(" alert general [Message] - send an alert to all users.");
628 m_log.Error("backup - trigger a simulator backup"); 628 m_log.Error("backup - trigger a simulator backup");
629 m_log.Error("change-region - sets the region that many of these commands affect."); 629 m_log.Error("change-region [name] - sets the region that many of these commands affect.");
630 m_log.Error("command-script [filename] - Execute command in a file."); 630 m_log.Error("command-script [filename] - Execute command in a file.");
631 m_log.Error("debug - debugging commands"); 631 m_log.Error("debug - debugging commands");
632 m_log.Error(" packet 0..255 - print incoming/outgoing packets (0=off)"); 632 m_log.Error(" packet 0..255 - print incoming/outgoing packets (0=off)");
@@ -638,6 +638,7 @@ namespace OpenSim
638 m_log.Error("permissions [true/false] - turn on/off permissions on the scene"); 638 m_log.Error("permissions [true/false] - turn on/off permissions on the scene");
639 m_log.Error("quit - equivalent to shutdown."); 639 m_log.Error("quit - equivalent to shutdown.");
640 m_log.Error("restart - disconnects all clients and restarts the sims in the instance."); 640 m_log.Error("restart - disconnects all clients and restarts the sims in the instance.");
641 m_log.Error("remove-region [name] - remove a region");
641 m_log.Error("save-xml [filename] - save prims to XML"); 642 m_log.Error("save-xml [filename] - save prims to XML");
642 m_log.Error("save-xml2 [filename] - save prims to XML using version 2 format"); 643 m_log.Error("save-xml2 [filename] - save prims to XML using version 2 format");
643 m_log.Error("script - manually trigger scripts? or script commands?"); 644 m_log.Error("script - manually trigger scripts? or script commands?");
@@ -771,7 +772,6 @@ namespace OpenSim
771 } 772 }
772 m_regionData.Remove(killScene.RegionInfo); 773 m_regionData.Remove(killScene.RegionInfo);
773 m_sceneManager.CloseScene(killScene); 774 m_sceneManager.CloseScene(killScene);
774
775 } 775 }
776 break; 776 break;
777 777
diff --git a/OpenSim/Region/Environment/Modules/SunModule.cs b/OpenSim/Region/Environment/Modules/SunModule.cs
index c941b1e..2dd5b77 100644
--- a/OpenSim/Region/Environment/Modules/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/SunModule.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.Environment.Modules
152 // sunPhase = 12; 152 // sunPhase = 12;
153 // } 153 // }
154 // sunPhase = sunPhase - 12; 154 // sunPhase = sunPhase - 12;
155 155 //
156 // float yValue = 0.1f*(sunPhase); 156 // float yValue = 0.1f*(sunPhase);
157 // Console.WriteLine("Computed SunPhase: {0}, yValue: {1}", sunPhase, yValue); 157 // Console.WriteLine("Computed SunPhase: {0}, yValue: {1}", sunPhase, yValue);
158 // if (yValue > 1.2f) 158 // if (yValue > 1.2f)
@@ -182,6 +182,5 @@ namespace OpenSim.Region.Environment.Modules
182 // viewertime.TimeInfo.UsecSinceStart = (ulong) Util.UnixTimeSinceEpoch(); 182 // viewertime.TimeInfo.UsecSinceStart = (ulong) Util.UnixTimeSinceEpoch();
183 // // OutPacket(viewertime); 183 // // OutPacket(viewertime);
184 // } 184 // }
185
186 } 185 }
187} \ No newline at end of file 186} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 83d3306..b8a2555 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Scenes
77 private LLVector3 lastPhysPos = new LLVector3(); 77 private LLVector3 lastPhysPos = new LLVector3();
78 private int m_wearablesSerial = 1; 78 private int m_wearablesSerial = 1;
79 79
80
81 // Position of agent's camera in world 80 // Position of agent's camera in world
82 protected Vector3 m_CameraCenter = new Vector3(0, 0, 0); 81 protected Vector3 m_CameraCenter = new Vector3(0, 0, 0);
83 82
@@ -553,7 +552,7 @@ namespace OpenSim.Region.Environment.Scenes
553 } 552 }
554 } 553 }
555 554
556 public void HandleAgentUpdate(IClientAPI remoteClient,AgentUpdatePacket agentData ) 555 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdatePacket agentData)
557 { 556 {
558 //if (m_isChildAgent) 557 //if (m_isChildAgent)
559 //{ 558 //{
@@ -573,7 +572,6 @@ namespace OpenSim.Region.Environment.Scenes
573 m_CameraCenter.y = agentData.AgentData.CameraCenter.Y; 572 m_CameraCenter.y = agentData.AgentData.CameraCenter.Y;
574 m_CameraCenter.z = agentData.AgentData.CameraCenter.Z; 573 m_CameraCenter.z = agentData.AgentData.CameraCenter.Z;
575 574
576
577 // Use these three vectors to figure out what the agent is looking at 575 // Use these three vectors to figure out what the agent is looking at
578 // Convert it to a Matrix and/or Quaternion 576 // Convert it to a Matrix and/or Quaternion
579 m_CameraAtAxis.x = agentData.AgentData.CameraAtAxis.X; 577 m_CameraAtAxis.x = agentData.AgentData.CameraAtAxis.X;
@@ -632,7 +630,6 @@ namespace OpenSim.Region.Environment.Scenes
632 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 630 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
633 bool oldflying = PhysicsActor.Flying; 631 bool oldflying = PhysicsActor.Flying;
634 632
635
636 PhysicsActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); 633 PhysicsActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
637 if (PhysicsActor.Flying != oldflying) 634 if (PhysicsActor.Flying != oldflying)
638 { 635 {
@@ -883,10 +880,10 @@ namespace OpenSim.Region.Environment.Scenes
883 } 880 }
884 881
885 NewForce newVelocity = new NewForce(); 882 NewForce newVelocity = new NewForce();
886 Vector3 direc = rotation*vec; 883 Vector3 direc = rotation * vec;
887 direc.Normalize(); 884 direc.Normalize();
888 885
889 direc = direc*((0.03f)*128f); 886 direc *= 0.03f * 128f;
890 if (m_physicsActor.Flying) 887 if (m_physicsActor.Flying)
891 { 888 {
892 direc *= 4; 889 direc *= 4;
@@ -944,15 +941,12 @@ namespace OpenSim.Region.Environment.Scenes
944 941
945 if (m_isChildAgent == false) 942 if (m_isChildAgent == false)
946 { 943 {
947 /// check for user movement 'forces' (ie commands to move) 944 if (m_newForce) // user movement 'forces' (ie commands to move)
948 if (m_newForce)
949 { 945 {
950 SendTerseUpdateToAllClients(); 946 SendTerseUpdateToAllClients();
951 m_updateCount = 0; 947 m_updateCount = 0;
952 } 948 }
953 949 else if (m_movementflag != 0) // scripted movement (?)
954 /// check for scripted movement (?)
955 else if (m_movementflag != 0)
956 { 950 {
957 m_updateCount++; 951 m_updateCount++;
958 if (m_updateCount > 3) 952 if (m_updateCount > 3)
@@ -961,9 +955,7 @@ namespace OpenSim.Region.Environment.Scenes
961 m_updateCount = 0; 955 m_updateCount = 0;
962 } 956 }
963 } 957 }
964 958 else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02) // physics-related movement
965 /// check for physics-related movement
966 else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02)
967 { 959 {
968 SendTerseUpdateToAllClients(); 960 SendTerseUpdateToAllClients();
969 m_updateCount = 0; 961 m_updateCount = 0;
@@ -1071,9 +1063,9 @@ namespace OpenSim.Region.Environment.Scenes
1071 /// 1063 ///
1072 /// </summary> 1064 /// </summary>
1073 /// <param name="client"></param> 1065 /// <param name="client"></param>
1074 public void SendOwnAppearance( ) 1066 public void SendOwnAppearance()
1075 { 1067 {
1076 SendOwnWearables( ); 1068 SendOwnWearables();
1077 1069
1078 // TODO: remove this once the SunModule is slightly more tested 1070 // TODO: remove this once the SunModule is slightly more tested
1079 // m_controllingClient.SendViewerTime(m_scene.TimePhase); 1071 // m_controllingClient.SendViewerTime(m_scene.TimePhase);
@@ -1224,7 +1216,6 @@ namespace OpenSim.Region.Environment.Scenes
1224 1216
1225 #endregion 1217 #endregion
1226 1218
1227
1228 public void GrantGodlikePowers(LLUUID agentID, LLUUID sessionID, LLUUID token) 1219 public void GrantGodlikePowers(LLUUID agentID, LLUUID sessionID, LLUUID token)
1229 { 1220 {
1230 GrantGodlikePowersPacket respondPacket = new GrantGodlikePowersPacket(); 1221 GrantGodlikePowersPacket respondPacket = new GrantGodlikePowersPacket();
@@ -1240,10 +1231,8 @@ namespace OpenSim.Region.Environment.Scenes
1240 respondPacket.GrantData = gdb; 1231 respondPacket.GrantData = gdb;
1241 respondPacket.AgentData = adb; 1232 respondPacket.AgentData = adb;
1242 ControllingClient.OutPacket(respondPacket, ThrottleOutPacketType.Task); 1233 ControllingClient.OutPacket(respondPacket, ThrottleOutPacketType.Task);
1243
1244
1245
1246 } 1234 }
1235
1247 /// <summary> 1236 /// <summary>
1248 /// 1237 ///
1249 /// </summary> 1238 /// </summary>
@@ -1267,7 +1256,6 @@ namespace OpenSim.Region.Environment.Scenes
1267 1256
1268 m_updateflag = true; 1257 m_updateflag = true;
1269 1258
1270
1271 Velocity = new LLVector3(force.X, force.Y, force.Z); 1259 Velocity = new LLVector3(force.X, force.Y, force.Z);
1272 m_newForce = true; 1260 m_newForce = true;
1273 } 1261 }
@@ -1317,7 +1305,6 @@ namespace OpenSim.Region.Environment.Scenes
1317 } 1305 }
1318 } 1306 }
1319 1307
1320
1321 public override void SetText(string text, Vector3 color, double alpha) 1308 public override void SetText(string text, Vector3 color, double alpha)
1322 { 1309 {
1323 throw new Exception("Can't set Text on avatar."); 1310 throw new Exception("Can't set Text on avatar.");
@@ -1335,14 +1322,13 @@ namespace OpenSim.Region.Environment.Scenes
1335 m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 1322 m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
1336 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 1323 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
1337 } 1324 }
1325
1338 private void PhysicsCollisionUpdate(EventArgs e) 1326 private void PhysicsCollisionUpdate(EventArgs e)
1339 { 1327 {
1340 bool isUserMoving = false; 1328 bool isUserMoving = Velocity.X > 0 || Velocity.Y > 0;
1341 if (Velocity.X > 0 || Velocity.Y > 0)
1342 isUserMoving = true;
1343 UpdateMovementAnimations(isUserMoving); 1329 UpdateMovementAnimations(isUserMoving);
1344
1345 } 1330 }
1331
1346 internal void Close() 1332 internal void Close()
1347 { 1333 {
1348 RemoveFromPhysicalScene(); 1334 RemoveFromPhysicalScene();
@@ -1352,13 +1338,11 @@ namespace OpenSim.Region.Environment.Scenes
1352 { 1338 {
1353 m_wearables[wearableId] = wearable; 1339 m_wearables[wearableId] = wearable;
1354 SendOwnWearables(); 1340 SendOwnWearables();
1355
1356 } 1341 }
1357 1342
1358 private void SendOwnWearables() 1343 private void SendOwnWearables()
1359 { 1344 {
1360 m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++); 1345 m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++);
1361 } 1346 }
1362
1363 } 1347 }
1364} 1348}
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 535d519..d5f702d 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
35using OpenSim.Region.Environment; 35using OpenSim.Region.Environment;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
37using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
38 37
39namespace SimpleApp 38namespace SimpleApp
40{ 39{
@@ -47,7 +46,7 @@ namespace SimpleApp
47 ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks) 46 ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks)
48 : base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true, false) 47 : base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true, false)
49 { 48 {
50 m_avatars = new List<Avatar>(); 49 m_avatars = new List<ScenePresence>();
51 } 50 }
52 51
53 public override void LoadWorldMap() 52 public override void LoadWorldMap()
@@ -56,9 +55,6 @@ namespace SimpleApp
56 55
57 for (int i = 0; i < 65536; i++) 56 for (int i = 0; i < 65536; i++)
58 { 57 {
59 //int x = i%256;
60 //int y = i/256;
61
62 map[i] = 25f; 58 map[i] = 25f;
63 } 59 }
64 60
@@ -77,8 +73,7 @@ namespace SimpleApp
77 73
78 client.OnCompleteMovementToRegion += 74 client.OnCompleteMovementToRegion +=
79 delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); }; 75 delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); };
80 76
81
82 client.SendRegionHandshake(m_regInfo); 77 client.SendRegionHandshake(m_regInfo);
83 } 78 }
84 } 79 }