aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs122
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs19
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs8
-rw-r--r--OpenSim/Data/AssetDataBase.cs2
-rw-r--r--OpenSim/Data/IAssetData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs4
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations2
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Framework/AssetBase.cs8
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs7
-rw-r--r--OpenSim/Framework/LandData.cs2
-rw-r--r--OpenSim/Framework/ParcelMediaCommandEnum.cs2
-rw-r--r--OpenSim/Framework/PluginLoader.cs17
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs65
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs19
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs4
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs131
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs5
-rw-r--r--OpenSim/Framework/UndoStack.cs58
-rw-r--r--OpenSim/Framework/Util.cs26
-rw-r--r--OpenSim/Framework/Watchdog.cs6
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs76
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs251
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs66
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs39
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs115
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs25
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs70
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs63
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs57
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs19
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs762
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs10
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs74
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs17
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs15
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs18
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs37
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs351
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs24
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs5
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs9
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs5
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityInventory.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInterregionComms.cs8
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISnmpModule.cs27
-rw-r--r--OpenSim/Region/Framework/ModuleLoader.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs214
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs24
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs221
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs256
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs243
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs656
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs281
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs570
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs979
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/UndoState.cs168
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs8
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs3
-rw-r--r--OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs16
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs9
-rw-r--r--OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs4
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs3
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs58
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs1437
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs3917
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs375
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs (renamed from OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs)46
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs3869
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs122
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs98
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs1
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs6
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSPrim.cs2
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs82
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1877
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs53
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs47
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs28
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs341
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs1
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs23
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs5
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs120
-rw-r--r--OpenSim/Services/Connectors/Land/LandServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs11
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs18
-rw-r--r--OpenSim/Services/Interfaces/IAttachmentsService.cs17
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs14
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs8
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs6
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
-rw-r--r--OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs3
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs8
-rw-r--r--ThirdParty/SmartThreadPool/SmartThreadPool.cs13
-rw-r--r--bin/OpenSim.Framework.Communications.Tests.dll.config33
-rw-r--r--bin/OpenSim.Framework.Servers.Tests.dll.config33
-rw-r--r--bin/OpenSim.Framework.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.CoreModules.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.Framework.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.ScriptEngine.Tests.dll.config33
-rw-r--r--bin/OpenSimDefaults.ini.example1325
-rw-r--r--bin/assets/TexturesAssetSet/defaultalpha.jp2bin0 -> 319 bytes
-rw-r--r--prebuild.xml31
140 files changed, 17803 insertions, 2905 deletions
diff --git a/.gitignore b/.gitignore
index 8d3f2b2..e2bef71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
1.project 1.project
2.settings 2.settings
3.gitignore
3*.csproj 4*.csproj
4*.csproj.user 5*.csproj.user
5*.build 6*.build
@@ -10,6 +11,7 @@
10*.pidb 11*.pidb
11*.dll.build 12*.dll.build
12*.dll 13*.dll
14*.log
13*.VisualState.xml 15*.VisualState.xml
14*/*/obj 16*/*/obj
15*/*/*/obj 17*/*/*/obj
@@ -23,6 +25,7 @@
23*/*/*/*/*/bin 25*/*/*/*/*/bin
24*/*/*/*/*/*/bin 26*/*/*/*/*/*/bin
25*/*/*/*/*/*/*/bin 27*/*/*/*/*/*/*/bin
28addon-modules/
26bin/Debug/*.dll 29bin/Debug/*.dll
27bin/*.dll.mdb 30bin/*.dll.mdb
28bin/*.db 31bin/*.db
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c09252a..7b931d7 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -128,6 +128,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
128 availableMethods["admin_region_query"] = XmlRpcRegionQueryMethod; 128 availableMethods["admin_region_query"] = XmlRpcRegionQueryMethod;
129 availableMethods["admin_shutdown"] = XmlRpcShutdownMethod; 129 availableMethods["admin_shutdown"] = XmlRpcShutdownMethod;
130 availableMethods["admin_broadcast"] = XmlRpcAlertMethod; 130 availableMethods["admin_broadcast"] = XmlRpcAlertMethod;
131 availableMethods["admin_dialog"] = XmlRpcDialogMethod;
131 availableMethods["admin_restart"] = XmlRpcRestartMethod; 132 availableMethods["admin_restart"] = XmlRpcRestartMethod;
132 availableMethods["admin_load_heightmap"] = XmlRpcLoadHeightmapMethod; 133 availableMethods["admin_load_heightmap"] = XmlRpcLoadHeightmapMethod;
133 // User management 134 // User management
@@ -217,9 +218,59 @@ namespace OpenSim.ApplicationPlugins.RemoteController
217 if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene)) 218 if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene))
218 throw new Exception("region not found"); 219 throw new Exception("region not found");
219 220
221 int timeout = 30000;
222 string message;
223
224 if (requestData.ContainsKey("restart")
225 && ((string)requestData["restart"] == "delayed")
226 && requestData.ContainsKey("milliseconds"))
227 {
228 timeout = Int32.Parse(requestData["milliseconds"].ToString());
229
230 if (timeout < 15000)
231 {
232 //It must be at least 15 seconds or we'll cancel the reboot request
233 timeout = 15000;
234 }
235
236 message
237 = "Region is restarting in " + ((int)(timeout / 1000)).ToString()
238 + " second(s). Please save what you are doing and log out.";
239 }
240 else
241 {
242 message = "Region is restarting in 30 second(s). Please save what you are doing and log out.";
243 }
244
245 if (requestData.ContainsKey("noticetype")
246 && ((string)requestData["noticetype"] == "dialog"))
247 {
248 m_application.SceneManager.ForEachScene(
249 delegate(Scene scene)
250 {
251 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
252 if (dialogModule != null)
253 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
254 });
255 }
256 else
257 {
258 if (!requestData.ContainsKey("noticetype")
259 || ((string)requestData["noticetype"] != "none"))
260 {
261 m_application.SceneManager.ForEachScene(
262 delegate(Scene scene)
263 {
264 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
265 if (dialogModule != null)
266 dialogModule.SendGeneralAlert(message);
267 });
268 }
269 }
270
220 responseData["rebooting"] = true; 271 responseData["rebooting"] = true;
221 response.Value = responseData; 272 response.Value = responseData;
222 rebootedScene.Restart(30); 273 rebootedScene.Restart(timeout / 1000,false);
223 } 274 }
224 catch (Exception e) 275 catch (Exception e)
225 { 276 {
@@ -282,6 +333,53 @@ namespace OpenSim.ApplicationPlugins.RemoteController
282 m_log.Info("[RADMIN]: Alert request complete"); 333 m_log.Info("[RADMIN]: Alert request complete");
283 return response; 334 return response;
284 } 335 }
336 public XmlRpcResponse XmlRpcDialogMethod(XmlRpcRequest request, IPEndPoint remoteClient)
337 {
338 XmlRpcResponse response = new XmlRpcResponse();
339 Hashtable responseData = new Hashtable();
340
341 m_log.Info("[RADMIN]: Dialog request started");
342
343 try
344 {
345 Hashtable requestData = (Hashtable)request.Params[0];
346
347 CheckStringParameters(request, new string[] { "password", "from", "message" });
348
349 if (m_requiredPassword != String.Empty &&
350 (!requestData.Contains("password") || (string)requestData["password"] != m_requiredPassword))
351 throw new Exception("wrong password");
352
353 string message = (string)requestData["message"];
354 string fromuuid = (string)requestData["from"];
355 m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
356
357 responseData["accepted"] = true;
358 responseData["success"] = true;
359 response.Value = responseData;
360
361 m_application.SceneManager.ForEachScene(
362 delegate(Scene scene)
363 {
364 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
365 if (dialogModule != null)
366 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
367 });
368 }
369 catch (Exception e)
370 {
371 m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message);
372 m_log.DebugFormat("[RADMIN]: Broadcasting: failed: {0}", e.ToString());
373
374 responseData["accepted"] = false;
375 responseData["success"] = false;
376 responseData["error"] = e.Message;
377 response.Value = responseData;
378 }
379
380 m_log.Info("[RADMIN]: Alert request complete");
381 return response;
382 }
285 383
286 public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient) 384 public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient)
287 { 385 {
@@ -389,13 +487,33 @@ namespace OpenSim.ApplicationPlugins.RemoteController
389 message = "Region is going down now."; 487 message = "Region is going down now.";
390 } 488 }
391 489
392 m_application.SceneManager.ForEachScene( 490 if (requestData.ContainsKey("noticetype")
491 && ((string) requestData["noticetype"] == "dialog"))
492 {
493 m_application.SceneManager.ForEachScene(
393 delegate(Scene scene) 494 delegate(Scene scene)
394 { 495 {
395 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>(); 496 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
396 if (dialogModule != null) 497 if (dialogModule != null)
498 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
499 });
500 }
501 else
502 {
503 if (!requestData.ContainsKey("noticetype")
504 || ((string)requestData["noticetype"] != "none"))
505 {
506 m_application.SceneManager.ForEachScene(
507 delegate(Scene scene)
508 {
509 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
510 if (dialogModule != null)
397 dialogModule.SendGeneralAlert(message); 511 dialogModule.SendGeneralAlert(message);
398 }); 512 });
513 }
514 }
515
516
399 517
400 // Perform shutdown 518 // Perform shutdown
401 System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing 519 System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 19331c6..06110c3 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -593,6 +593,7 @@ namespace OpenSim.Client.MXP.ClientStack
593 public event DisconnectUser OnDisconnectUser; 593 public event DisconnectUser OnDisconnectUser;
594 public event RequestAvatarProperties OnRequestAvatarProperties; 594 public event RequestAvatarProperties OnRequestAvatarProperties;
595 public event SetAlwaysRun OnSetAlwaysRun; 595 public event SetAlwaysRun OnSetAlwaysRun;
596 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
596 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 597 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
597 public event DeRezObject OnDeRezObject; 598 public event DeRezObject OnDeRezObject;
598 public event Action<IClientAPI> OnRegionHandShakeReply; 599 public event Action<IClientAPI> OnRegionHandShakeReply;
@@ -835,10 +836,18 @@ namespace OpenSim.Client.MXP.ClientStack
835 836
836 public void Close() 837 public void Close()
837 { 838 {
839 Close(true);
840 }
841
842 public void Close(bool sendStop)
843 {
838 m_log.Info("[MXP ClientStack] Close Called"); 844 m_log.Info("[MXP ClientStack] Close Called");
839 845
840 // Tell the client to go 846 // Tell the client to go
841 SendLogoutPacket(); 847 if (sendStop == true)
848 {
849 SendLogoutPacket();
850 }
842 851
843 // Let MXPPacketServer clean it up 852 // Let MXPPacketServer clean it up
844 if (Session.SessionState != SessionState.Disconnected) 853 if (Session.SessionState != SessionState.Disconnected)
@@ -884,7 +893,13 @@ namespace OpenSim.Client.MXP.ClientStack
884 // Need to translate to MXP somehow 893 // Need to translate to MXP somehow
885 } 894 }
886 895
887 public void SendKillObject(ulong regionHandle, uint localID) 896 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
897 {
898 foreach (uint localID in localIDs)
899 SendKillObject(regionHandle, localID);
900 }
901
902 private void SendKillObject(ulong regionHandle, uint localID)
888 { 903 {
889 DisappearanceEventMessage de = new DisappearanceEventMessage(); 904 DisappearanceEventMessage de = new DisappearanceEventMessage();
890 de.ObjectIndex = localID; 905 de.ObjectIndex = localID;
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 0d23232..bc5dc9e 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -290,6 +290,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
290 public event GenericCall2 OnStopMovement = delegate { }; 290 public event GenericCall2 OnStopMovement = delegate { };
291 public event Action<UUID> OnRemoveAvatar = delegate { }; 291 public event Action<UUID> OnRemoveAvatar = delegate { };
292 public event ObjectPermissions OnObjectPermissions = delegate { }; 292 public event ObjectPermissions OnObjectPermissions = delegate { };
293 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy = delegate { };
293 public event CreateNewInventoryItem OnCreateNewInventoryItem = delegate { }; 294 public event CreateNewInventoryItem OnCreateNewInventoryItem = delegate { };
294 public event LinkInventoryItem OnLinkInventoryItem = delegate { }; 295 public event LinkInventoryItem OnLinkInventoryItem = delegate { };
295 public event CreateInventoryFolder OnCreateNewInventoryFolder = delegate { }; 296 public event CreateInventoryFolder OnCreateNewInventoryFolder = delegate { };
@@ -452,6 +453,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
452 453
453 public void Close() 454 public void Close()
454 { 455 {
456 Close(true);
457 }
458
459 public void Close(bool sendStop)
460 {
455 throw new System.NotImplementedException(); 461 throw new System.NotImplementedException();
456 } 462 }
457 463
@@ -485,7 +491,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
485 throw new System.NotImplementedException(); 491 throw new System.NotImplementedException();
486 } 492 }
487 493
488 public void SendKillObject(ulong regionHandle, uint localID) 494 public void SendKillObject(ulong regionHandle, List<uint> localID)
489 { 495 {
490 throw new System.NotImplementedException(); 496 throw new System.NotImplementedException();
491 } 497 }
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index e1a810c..b4ae913 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Data
38 { 38 {
39 public abstract AssetBase GetAsset(UUID uuid); 39 public abstract AssetBase GetAsset(UUID uuid);
40 40
41 public abstract void StoreAsset(AssetBase asset); 41 public abstract bool StoreAsset(AssetBase asset);
42 public abstract bool ExistsAsset(UUID uuid); 42 public abstract bool ExistsAsset(UUID uuid);
43 43
44 public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count); 44 public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index f31b215c..0c8eadd 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Data
34 public interface IAssetDataPlugin : IPlugin 34 public interface IAssetDataPlugin : IPlugin
35 { 35 {
36 AssetBase GetAsset(UUID uuid); 36 AssetBase GetAsset(UUID uuid);
37 void StoreAsset(AssetBase asset); 37 bool StoreAsset(AssetBase asset);
38 bool ExistsAsset(UUID uuid); 38 bool ExistsAsset(UUID uuid);
39 List<AssetMetadata> FetchAssetMetadataSet(int start, int count); 39 List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
40 void Initialise(string connect); 40 void Initialise(string connect);
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index c7488d8..c882555 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Data.MSSQL
143 /// Create asset in m_database 143 /// Create asset in m_database
144 /// </summary> 144 /// </summary>
145 /// <param name="asset">the asset</param> 145 /// <param name="asset">the asset</param>
146 override public void StoreAsset(AssetBase asset) 146 override public bool StoreAsset(AssetBase asset)
147 { 147 {
148 148
149 string sql = 149 string sql =
@@ -192,10 +192,12 @@ namespace OpenSim.Data.MSSQL
192 try 192 try
193 { 193 {
194 command.ExecuteNonQuery(); 194 command.ExecuteNonQuery();
195 return true;
195 } 196 }
196 catch(Exception e) 197 catch(Exception e)
197 { 198 {
198 m_log.Error("[ASSET DB]: Error storing item :" + e.Message); 199 m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
200 return false;
199 } 201 }
200 } 202 }
201 } 203 }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index ed92f3e..0b0a638 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Data.MySQL
153 /// </summary> 153 /// </summary>
154 /// <param name="asset">Asset UUID to create</param> 154 /// <param name="asset">Asset UUID to create</param>
155 /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> 155 /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
156 override public void StoreAsset(AssetBase asset) 156 override public bool StoreAsset(AssetBase asset)
157 { 157 {
158 lock (m_dbLock) 158 lock (m_dbLock)
159 { 159 {
@@ -201,12 +201,14 @@ namespace OpenSim.Data.MySQL
201 cmd.Parameters.AddWithValue("?data", asset.Data); 201 cmd.Parameters.AddWithValue("?data", asset.Data);
202 cmd.ExecuteNonQuery(); 202 cmd.ExecuteNonQuery();
203 cmd.Dispose(); 203 cmd.Dispose();
204 return true;
204 } 205 }
205 } 206 }
206 catch (Exception e) 207 catch (Exception e)
207 { 208 {
208 m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}", 209 m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
209 asset.FullID, asset.Name, e.Message); 210 asset.FullID, asset.Name, e.Message);
211 return false;
210 } 212 }
211 } 213 }
212 } 214 }
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index ba8d538..645f4e8 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -717,7 +717,7 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
717 717
718COMMIT; 718COMMIT;
719 719
720:VERSION 32 720:VERSION 32 #---------------------
721 721
722BEGIN; 722BEGIN;
723CREATE TABLE `regionwindlight` ( 723CREATE TABLE `regionwindlight` (
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 5b71897..9a4eb76 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
124 /// Create an asset 124 /// Create an asset
125 /// </summary> 125 /// </summary>
126 /// <param name="asset">Asset Base</param> 126 /// <param name="asset">Asset Base</param>
127 override public void StoreAsset(AssetBase asset) 127 override public bool StoreAsset(AssetBase asset)
128 { 128 {
129 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); 129 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
130 if (ExistsAsset(asset.FullID)) 130 if (ExistsAsset(asset.FullID))
@@ -146,6 +146,7 @@ namespace OpenSim.Data.SQLite
146 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 146 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
147 147
148 cmd.ExecuteNonQuery(); 148 cmd.ExecuteNonQuery();
149 return true;
149 } 150 }
150 } 151 }
151 } 152 }
@@ -166,6 +167,7 @@ namespace OpenSim.Data.SQLite
166 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 167 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
167 168
168 cmd.ExecuteNonQuery(); 169 cmd.ExecuteNonQuery();
170 return true;
169 } 171 }
170 } 172 }
171 } 173 }
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
index df50902..3da298b 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.SQLiteLegacy
119 /// Create an asset 119 /// Create an asset
120 /// </summary> 120 /// </summary>
121 /// <param name="asset">Asset Base</param> 121 /// <param name="asset">Asset Base</param>
122 override public void StoreAsset(AssetBase asset) 122 override public bool StoreAsset(AssetBase asset)
123 { 123 {
124 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); 124 //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
125 if (ExistsAsset(asset.FullID)) 125 if (ExistsAsset(asset.FullID))
@@ -139,6 +139,7 @@ namespace OpenSim.Data.SQLiteLegacy
139 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 139 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
140 140
141 cmd.ExecuteNonQuery(); 141 cmd.ExecuteNonQuery();
142 return true;
142 } 143 }
143 } 144 }
144 } 145 }
@@ -157,6 +158,7 @@ namespace OpenSim.Data.SQLiteLegacy
157 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); 158 cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
158 159
159 cmd.ExecuteNonQuery(); 160 cmd.ExecuteNonQuery();
161 return true;
160 } 162 }
161 } 163 }
162 } 164 }
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 53d28be..98fa846 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -60,6 +60,8 @@ namespace OpenSim.Framework
60 /// </summary> 60 /// </summary>
61 private AssetMetadata m_metadata; 61 private AssetMetadata m_metadata;
62 62
63 private int m_uploadAttempts;
64
63 // This is needed for .NET serialization!!! 65 // This is needed for .NET serialization!!!
64 // Do NOT "Optimize" away! 66 // Do NOT "Optimize" away!
65 public AssetBase() 67 public AssetBase()
@@ -197,6 +199,12 @@ namespace OpenSim.Framework
197 set { m_metadata.Type = value; } 199 set { m_metadata.Type = value; }
198 } 200 }
199 201
202 public int UploadAttempts
203 {
204 get { return m_uploadAttempts; }
205 set { m_uploadAttempts = value; }
206 }
207
200 /// <summary> 208 /// <summary>
201 /// Is this a region only asset, or does this exist on the asset server also 209 /// Is this a region only asset, or does this exist on the asset server also
202 /// </summary> 210 /// </summary>
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 97b3b60..42c0b18 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -363,7 +363,7 @@ namespace OpenSim.Framework.Communications
363 _request = (HttpWebRequest) WebRequest.Create(buildUri()); 363 _request = (HttpWebRequest) WebRequest.Create(buildUri());
364 _request.KeepAlive = false; 364 _request.KeepAlive = false;
365 _request.ContentType = "application/xml"; 365 _request.ContentType = "application/xml";
366 _request.Timeout = 900000; 366 _request.Timeout = 30000;
367 _request.Method = RequestMethod; 367 _request.Method = RequestMethod;
368 _asyncException = null; 368 _asyncException = null;
369 _request.ContentLength = src.Length; 369 _request.ContentLength = src.Length;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 027f9c5..f8be9ad 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -264,6 +264,9 @@ namespace OpenSim.Framework
264 public delegate void MoveInventoryItem( 264 public delegate void MoveInventoryItem(
265 IClientAPI remoteClient, List<InventoryItemBase> items); 265 IClientAPI remoteClient, List<InventoryItemBase> items);
266 266
267 public delegate void MoveItemsAndLeaveCopy(
268 IClientAPI remoteClient, List<InventoryItemBase> items, UUID destFolder);
269
267 public delegate void RemoveInventoryItem( 270 public delegate void RemoveInventoryItem(
268 IClientAPI remoteClient, List<UUID> itemIDs); 271 IClientAPI remoteClient, List<UUID> itemIDs);
269 272
@@ -772,6 +775,7 @@ namespace OpenSim.Framework
772 event RequestTaskInventory OnRequestTaskInventory; 775 event RequestTaskInventory OnRequestTaskInventory;
773 event UpdateInventoryItem OnUpdateInventoryItem; 776 event UpdateInventoryItem OnUpdateInventoryItem;
774 event CopyInventoryItem OnCopyInventoryItem; 777 event CopyInventoryItem OnCopyInventoryItem;
778 event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
775 event MoveInventoryItem OnMoveInventoryItem; 779 event MoveInventoryItem OnMoveInventoryItem;
776 event RemoveInventoryFolder OnRemoveInventoryFolder; 780 event RemoveInventoryFolder OnRemoveInventoryFolder;
777 event RemoveInventoryItem OnRemoveInventoryItem; 781 event RemoveInventoryItem OnRemoveInventoryItem;
@@ -942,6 +946,7 @@ namespace OpenSim.Framework
942 void InPacket(object NewPack); 946 void InPacket(object NewPack);
943 void ProcessInPacket(Packet NewPack); 947 void ProcessInPacket(Packet NewPack);
944 void Close(); 948 void Close();
949 void Close(bool sendStop);
945 void Kick(string message); 950 void Kick(string message);
946 951
947 /// <summary> 952 /// <summary>
@@ -973,7 +978,7 @@ namespace OpenSim.Framework
973 /// </summary> 978 /// </summary>
974 /// <param name="regionHandle"></param> 979 /// <param name="regionHandle"></param>
975 /// <param name="localID"></param> 980 /// <param name="localID"></param>
976 void SendKillObject(ulong regionHandle, uint localID); 981 void SendKillObject(ulong regionHandle, List<uint> localID);
977 982
978 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); 983 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
979 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 984 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index accf52e..3fb2fd6 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Framework
62 62
63 private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark | 63 private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
64 (uint) ParcelFlags.AllowAPrimitiveEntry | 64 (uint) ParcelFlags.AllowAPrimitiveEntry |
65 (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform | 65 (uint) ParcelFlags.AllowDeedToGroup |
66 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts | 66 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
67 (uint) ParcelFlags.SoundLocal; 67 (uint) ParcelFlags.SoundLocal;
68 68
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
index 93c41ec..e714382 100644
--- a/OpenSim/Framework/ParcelMediaCommandEnum.cs
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -27,7 +27,7 @@
27 27
28namespace OpenSim.Framework 28namespace OpenSim.Framework
29{ 29{
30 public enum ParcelMediaCommandEnum 30 public enum ParcelMediaCommandEnum : int
31 { 31 {
32 Stop = 0, 32 Stop = 0,
33 Pause = 1, 33 Pause = 1,
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 819cb7b..cc80943 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -244,13 +244,22 @@ namespace OpenSim.Framework
244 // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) 244 // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
245 // occasionally seems to corrupt its addin cache 245 // occasionally seems to corrupt its addin cache
246 // Hence, as a temporary solution we'll remove it before each startup 246 // Hence, as a temporary solution we'll remove it before each startup
247
248 string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
249 string v0 = "addin-db-000";
250 string v1 = "addin-db-001";
251 if (customDir != null && customDir != String.Empty)
252 {
253 v0 = Path.Combine(customDir, v0);
254 v1 = Path.Combine(customDir, v1);
255 }
247 try 256 try
248 { 257 {
249 if (Directory.Exists("addin-db-000")) 258 if (Directory.Exists(v0))
250 Directory.Delete("addin-db-000", true); 259 Directory.Delete(v0, true);
251 260
252 if (Directory.Exists("addin-db-001")) 261 if (Directory.Exists(v1))
253 Directory.Delete("addin-db-001", true); 262 Directory.Delete(v1, true);
254 } 263 }
255 catch (IOException) 264 catch (IOException)
256 { 265 {
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 927415e..20b9cf1 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1333,7 +1333,7 @@ namespace OpenSim.Framework
1333 prim.Textures = this.Textures; 1333 prim.Textures = this.Textures;
1334 1334
1335 prim.Properties = new Primitive.ObjectProperties(); 1335 prim.Properties = new Primitive.ObjectProperties();
1336 prim.Properties.Name = "Primitive"; 1336 prim.Properties.Name = "Object";
1337 prim.Properties.Description = ""; 1337 prim.Properties.Description = "";
1338 prim.Properties.CreatorID = UUID.Zero; 1338 prim.Properties.CreatorID = UUID.Zero;
1339 prim.Properties.GroupID = UUID.Zero; 1339 prim.Properties.GroupID = UUID.Zero;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 176a523..806142f 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Console;
40 40
41namespace OpenSim.Framework 41namespace OpenSim.Framework
42{ 42{
43 [Serializable]
43 public class RegionLightShareData : ICloneable 44 public class RegionLightShareData : ICloneable
44 { 45 {
45 public bool valid = false; 46 public bool valid = false;
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 0ec4af5..f0ffc2c 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Framework.RegionLoader.Web
48 48
49 public RegionInfo[] LoadRegions() 49 public RegionInfo[] LoadRegions()
50 { 50 {
51 int tries = 3;
52 int wait = 2000;
53
51 if (m_configSource == null) 54 if (m_configSource == null)
52 { 55 {
53 m_log.Error("[WEBLOADER]: Unable to load configuration source!"); 56 m_log.Error("[WEBLOADER]: Unable to load configuration source!");
@@ -64,35 +67,47 @@ namespace OpenSim.Framework.RegionLoader.Web
64 } 67 }
65 else 68 else
66 { 69 {
67 HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url); 70 while (tries > 0)
68 webRequest.Timeout = 30000; //30 Second Timeout
69 m_log.Debug("[WEBLOADER]: Sending Download Request...");
70 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
71 m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server...");
72 StreamReader reader = new StreamReader(webResponse.GetResponseStream());
73 string xmlSource = String.Empty;
74 string tempStr = reader.ReadLine();
75 while (tempStr != null)
76 {
77 xmlSource = xmlSource + tempStr;
78 tempStr = reader.ReadLine();
79 }
80 m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
81 xmlSource.Length);
82 XmlDocument xmlDoc = new XmlDocument();
83 xmlDoc.LoadXml(xmlSource);
84 if (xmlDoc.FirstChild.Name == "Regions")
85 { 71 {
86 RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count]; 72 HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
87 int i; 73 webRequest.Timeout = 30000; //30 Second Timeout
88 for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++) 74 m_log.Debug("[WEBLOADER]: Sending Download Request...");
75 HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
76 m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server...");
77 StreamReader reader = new StreamReader(webResponse.GetResponseStream());
78 string xmlSource = String.Empty;
79 string tempStr = reader.ReadLine();
80 while (tempStr != null)
81 {
82 xmlSource = xmlSource + tempStr;
83 tempStr = reader.ReadLine();
84 }
85 m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
86 xmlSource.Length);
87 XmlDocument xmlDoc = new XmlDocument();
88 xmlDoc.LoadXml(xmlSource);
89 if (xmlDoc.FirstChild.Name == "Regions")
89 { 90 {
90 m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml); 91 RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count];
91 regionInfos[i] = 92 int i;
92 new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource); 93 for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
94 {
95 m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
96 regionInfos[i] =
97 new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
98 }
99
100 if (i > 0)
101 return regionInfos;
93 } 102 }
94 103
95 return regionInfos; 104 m_log.Debug("[WEBLOADER]: Request yielded no regions.");
105 tries--;
106 if (tries > 0)
107 {
108 m_log.Debug("[WEBLOADER]: Retrying");
109 System.Threading.Thread.Sleep(wait);
110 }
96 } 111 }
97 return null; 112 return null;
98 } 113 }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index cbab2db..8ff27c8 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -280,7 +280,7 @@ namespace OpenSim.Framework.Servers
280 280
281 EnhanceVersionInformation(); 281 EnhanceVersionInformation();
282 282
283 m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine); 283 m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine);
284 // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and 284 // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
285 // the clr version number doesn't match the project version number under Mono. 285 // the clr version number doesn't match the project version number under Mono.
286 //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); 286 //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
index eab463c..077a1e8 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs
@@ -57,11 +57,27 @@ namespace OpenSim.Framework.Servers.HttpServer
57 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception> 57 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception>
58 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj) 58 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
59 { 59 {
60 return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 100);
61 }
62 /// <summary>
63 /// Perform a synchronous REST request.
64 /// </summary>
65 /// <param name="verb"></param>
66 /// <param name="requestUrl"></param>
67 /// <param name="obj"> </param>
68 /// <param name="timeout"> </param>
69 /// <returns></returns>
70 ///
71 /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
72 /// the request. You'll want to make sure you deal with this as they're not uncommon</exception>
73 public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
74 {
60 Type type = typeof (TRequest); 75 Type type = typeof (TRequest);
61 TResponse deserial = default(TResponse); 76 TResponse deserial = default(TResponse);
62 77
63 WebRequest request = WebRequest.Create(requestUrl); 78 WebRequest request = WebRequest.Create(requestUrl);
64 request.Method = verb; 79 request.Method = verb;
80 request.Timeout = pTimeout * 1000;
65 81
66 if ((verb == "POST") || (verb == "PUT")) 82 if ((verb == "POST") || (verb == "PUT"))
67 { 83 {
@@ -81,7 +97,6 @@ namespace OpenSim.Framework.Servers.HttpServer
81 97
82 int length = (int) buffer.Length; 98 int length = (int) buffer.Length;
83 request.ContentLength = length; 99 request.ContentLength = length;
84
85 Stream requestStream = null; 100 Stream requestStream = null;
86 try 101 try
87 { 102 {
@@ -103,7 +118,7 @@ namespace OpenSim.Framework.Servers.HttpServer
103 { 118 {
104 using (WebResponse resp = request.GetResponse()) 119 using (WebResponse resp = request.GetResponse())
105 { 120 {
106 if (resp.ContentLength > 0) 121 if (resp.ContentLength != 0)
107 { 122 {
108 Stream respStream = resp.GetResponseStream(); 123 Stream respStream = resp.GetResponseStream();
109 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); 124 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index c9d4c93..ce6ecf8 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -33,7 +33,7 @@ namespace OpenSim
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34 34
35 public enum Flavour 35 public enum Flavour
36 { 36 {
37 Unknown, 37 Unknown,
38 Dev, 38 Dev,
39 RC1, 39 RC1,
@@ -49,7 +49,7 @@ namespace OpenSim
49 49
50 public static string GetVersionString(string versionNumber, Flavour flavour) 50 public static string GetVersionString(string versionNumber, Flavour flavour)
51 { 51 {
52 string versionString = "OpenSim " + versionNumber + " " + flavour; 52 string versionString = "Careminster " + versionNumber + " " + flavour;
53 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); 53 return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
54 } 54 }
55 55
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 25ae6b0..a8a53f2 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,9 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Threading;
31using System.Reflection;
30using System.Xml; 32using System.Xml;
33using System.Diagnostics;
31using System.Xml.Schema; 34using System.Xml.Schema;
32using System.Xml.Serialization; 35using System.Xml.Serialization;
36using log4net;
33using OpenMetaverse; 37using OpenMetaverse;
34 38
35namespace OpenSim.Framework 39namespace OpenSim.Framework
@@ -45,6 +49,124 @@ namespace OpenSim.Framework
45 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 50
47 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem)); 51 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53
54 private Thread LockedByThread;
55 /// <value>
56 /// An advanced lock for inventory data
57 /// </value>
58 private System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
59
60 /// <summary>
61 /// Are we readlocked by the calling thread?
62 /// </summary>
63 public bool IsReadLockedByMe()
64 {
65 if (m_itemLock.RecursiveReadCount > 0)
66 {
67 return true;
68 }
69 else
70 {
71 return false;
72 }
73 }
74
75 /// <summary>
76 /// Lock our inventory list for reading (many can read, one can write)
77 /// </summary>
78 public void LockItemsForRead(bool locked)
79 {
80 if (locked)
81 {
82 if (m_itemLock.IsWriteLockHeld && LockedByThread != null)
83 {
84 if (!LockedByThread.IsAlive)
85 {
86 //Locked by dead thread, reset.
87 m_itemLock = new System.Threading.ReaderWriterLockSlim();
88 }
89 }
90
91 if (m_itemLock.RecursiveReadCount > 0)
92 {
93 m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
94 try
95 {
96 StackTrace stackTrace = new StackTrace(); // get call stack
97 StackFrame[] stackFrames = stackTrace.GetFrames(); // get method calls (frames)
98
99 // write call stack method names
100 foreach (StackFrame stackFrame in stackFrames)
101 {
102 m_log.Error("[SceneObjectGroup.m_parts] "+(stackFrame.GetMethod().Name)); // write method name
103 }
104 }
105 catch
106 {}
107 m_itemLock.ExitReadLock();
108 }
109 if (m_itemLock.RecursiveWriteCount > 0)
110 {
111 m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
112 m_itemLock.ExitWriteLock();
113 }
114
115 while (!m_itemLock.TryEnterReadLock(60000))
116 {
117 m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
118 if (m_itemLock.IsWriteLockHeld)
119 {
120 m_itemLock = new System.Threading.ReaderWriterLockSlim();
121 }
122 }
123 }
124 else
125 {
126 if (m_itemLock.RecursiveReadCount>0)
127 {
128 m_itemLock.ExitReadLock();
129 }
130 }
131 }
132
133 /// <summary>
134 /// Lock our inventory list for writing (many can read, one can write)
135 /// </summary>
136 public void LockItemsForWrite(bool locked)
137 {
138 if (locked)
139 {
140 //Enter a write lock, wait indefinately for one to open.
141 if (m_itemLock.RecursiveReadCount > 0)
142 {
143 m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
144 m_itemLock.ExitReadLock();
145 }
146 if (m_itemLock.RecursiveWriteCount > 0)
147 {
148 m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
149 m_itemLock.ExitWriteLock();
150 }
151 while (!m_itemLock.TryEnterWriteLock(60000))
152 {
153 m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
154 if (m_itemLock.IsWriteLockHeld)
155 {
156 m_itemLock = new System.Threading.ReaderWriterLockSlim();
157 }
158 }
159
160 LockedByThread = Thread.CurrentThread;
161 }
162 else
163 {
164 if (m_itemLock.RecursiveWriteCount > 0)
165 {
166 m_itemLock.ExitWriteLock();
167 }
168 }
169 }
48 170
49 #region ICloneable Members 171 #region ICloneable Members
50 172
@@ -52,13 +174,12 @@ namespace OpenSim.Framework
52 { 174 {
53 TaskInventoryDictionary clone = new TaskInventoryDictionary(); 175 TaskInventoryDictionary clone = new TaskInventoryDictionary();
54 176
55 lock (this) 177 m_itemLock.EnterReadLock();
178 foreach (UUID uuid in Keys)
56 { 179 {
57 foreach (UUID uuid in Keys) 180 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
58 {
59 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
60 }
61 } 181 }
182 m_itemLock.ExitReadLock();
62 183
63 return clone; 184 return clone;
64 } 185 }
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 30d775c..248502e 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Framework
121 private UUID _permsGranter; 121 private UUID _permsGranter;
122 private int _permsMask; 122 private int _permsMask;
123 private int _type = 0; 123 private int _type = 0;
124 private UUID _oldID; 124 private UUID _oldID = UUID.Zero;
125 125
126 private bool _ownerChanged = false; 126 private bool _ownerChanged = false;
127 127
@@ -404,7 +404,8 @@ namespace OpenSim.Framework
404 /// <param name="partID">The new part ID to which this item belongs</param> 404 /// <param name="partID">The new part ID to which this item belongs</param>
405 public void ResetIDs(UUID partID) 405 public void ResetIDs(UUID partID)
406 { 406 {
407 OldItemID = ItemID; 407 if (_oldID == UUID.Zero)
408 _oldID = ItemID;
408 ItemID = UUID.Random(); 409 ItemID = UUID.Random();
409 ParentPartID = partID; 410 ParentPartID = partID;
410 ParentID = partID; 411 ParentID = partID;
diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index 4d800ae..4cd779a 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -36,33 +37,30 @@ namespace OpenSim.Framework
36 [Serializable] 37 [Serializable]
37 public class UndoStack<T> 38 public class UndoStack<T>
38 { 39 {
39 private int m_new = 1; 40 private List<T> m_undolist;
40 private int m_old = 0; 41 private int m_max;
41 private T[] m_Undos;
42 42
43 public UndoStack(int capacity) 43 public UndoStack(int capacity)
44 { 44 {
45 m_Undos = new T[capacity + 1]; 45 m_undolist = new List<T>();
46 m_max = capacity;
46 } 47 }
47 48
48 public bool IsFull 49 public bool IsFull
49 { 50 {
50 get { return m_new == m_old; } 51 get { return m_undolist.Count >= m_max; }
51 } 52 }
52 53
53 public int Capacity 54 public int Capacity
54 { 55 {
55 get { return m_Undos.Length - 1; } 56 get { return m_max; }
56 } 57 }
57 58
58 public int Count 59 public int Count
59 { 60 {
60 get 61 get
61 { 62 {
62 int count = m_new - m_old - 1; 63 return m_undolist.Count;
63 if (count < 0)
64 count += m_Undos.Length;
65 return count;
66 } 64 }
67 } 65 }
68 66
@@ -70,45 +68,39 @@ namespace OpenSim.Framework
70 { 68 {
71 if (IsFull) 69 if (IsFull)
72 { 70 {
73 m_old++; 71 m_undolist.RemoveAt(0);
74 if (m_old >= m_Undos.Length)
75 m_old -= m_Undos.Length;
76 } 72 }
77 if (++m_new >= m_Undos.Length) 73 m_undolist.Add(item);
78 m_new -= m_Undos.Length;
79 m_Undos[m_new] = item;
80 } 74 }
81 75
82 public T Pop() 76 public T Pop()
83 { 77 {
84 if (Count > 0) 78 if (m_undolist.Count > 0)
85 { 79 {
86 T deleted = m_Undos[m_new]; 80 int ind = m_undolist.Count - 1;
87 m_Undos[m_new--] = default(T); 81 T item = m_undolist[ind];
88 if (m_new < 0) 82 m_undolist.RemoveAt(ind);
89 m_new += m_Undos.Length; 83 return item;
90 return deleted;
91 } 84 }
92 else 85 else
93 throw new InvalidOperationException("Cannot pop from emtpy stack"); 86 throw new InvalidOperationException("Cannot pop from empty stack");
94 } 87 }
95 88
96 public T Peek() 89 public T Peek()
97 { 90 {
98 return m_Undos[m_new]; 91 if (m_undolist.Count > 0)
92 {
93 return m_undolist[m_undolist.Count - 1];
94 }
95 else
96 {
97 return default(T);
98 }
99 } 99 }
100 100
101 public void Clear() 101 public void Clear()
102 { 102 {
103 if (Count > 0) 103 m_undolist.Clear();
104 {
105 for (int i = 0; i < m_Undos.Length; i++)
106 {
107 m_Undos[i] = default(T);
108 }
109 m_new = 1;
110 m_old = 0;
111 }
112 } 104 }
113 } 105 }
114} 106}
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e8f8e01..6bee4be 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1016,19 +1016,19 @@ namespace OpenSim.Framework
1016 { 1016 {
1017 string os = String.Empty; 1017 string os = String.Empty;
1018 1018
1019 if (Environment.OSVersion.Platform != PlatformID.Unix) 1019// if (Environment.OSVersion.Platform != PlatformID.Unix)
1020 { 1020// {
1021 os = Environment.OSVersion.ToString(); 1021// os = Environment.OSVersion.ToString();
1022 } 1022// }
1023 else 1023// else
1024 { 1024// {
1025 os = ReadEtcIssue(); 1025// os = ReadEtcIssue();
1026 } 1026// }
1027 1027//
1028 if (os.Length > 45) 1028// if (os.Length > 45)
1029 { 1029// {
1030 os = os.Substring(0, 45); 1030// os = os.Substring(0, 45);
1031 } 1031// }
1032 1032
1033 return os; 1033 return os;
1034 } 1034 }
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 0f34e83..9baf3a0 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework
52 public ThreadWatchdogInfo(Thread thread) 52 public ThreadWatchdogInfo(Thread thread)
53 { 53 {
54 Thread = thread; 54 Thread = thread;
55 LastTick = Environment.TickCount & Int32.MaxValue; 55 LastTick = Environment.TickCount;
56 } 56 }
57 } 57 }
58 58
@@ -144,7 +144,7 @@ namespace OpenSim.Framework
144 try 144 try
145 { 145 {
146 if (m_threads.TryGetValue(threadID, out threadInfo)) 146 if (m_threads.TryGetValue(threadID, out threadInfo))
147 threadInfo.LastTick = Environment.TickCount & Int32.MaxValue; 147 threadInfo.LastTick = Environment.TickCount;
148 else 148 else
149 AddThread(new ThreadWatchdogInfo(Thread.CurrentThread)); 149 AddThread(new ThreadWatchdogInfo(Thread.CurrentThread));
150 } 150 }
@@ -170,7 +170,7 @@ namespace OpenSim.Framework
170 170
171 lock (m_threads) 171 lock (m_threads)
172 { 172 {
173 int now = Environment.TickCount & Int32.MaxValue; 173 int now = Environment.TickCount;
174 174
175 foreach (ThreadWatchdogInfo threadInfo in m_threads.Values) 175 foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
176 { 176 {
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6127c2d..493d412 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -442,7 +442,7 @@ namespace OpenSim
442 if (alert != null) 442 if (alert != null)
443 presence.ControllingClient.Kick(alert); 443 presence.ControllingClient.Kick(alert);
444 else 444 else
445 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 445 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
446 446
447 // ...and close on our side 447 // ...and close on our side
448 presence.Scene.IncomingCloseAgent(presence.UUID); 448 presence.Scene.IncomingCloseAgent(presence.UUID);
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 74ad168..c5ee385 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -88,6 +88,10 @@ namespace OpenSim
88 88
89 protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); 89 protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
90 90
91 private List<string> m_permsModules;
92
93 private bool m_securePermissionsLoading = true;
94
91 /// <value> 95 /// <value>
92 /// The config information passed into the OpenSimulator region server. 96 /// The config information passed into the OpenSimulator region server.
93 /// </value> 97 /// </value>
@@ -185,6 +189,11 @@ namespace OpenSim
185 CreatePIDFile(pidFile); 189 CreatePIDFile(pidFile);
186 190
187 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty); 191 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
192
193 m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
194
195 string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule");
196 m_permsModules = new List<string>(permissionModules.Split(','));
188 } 197 }
189 198
190 // Load the simulation data service 199 // Load the simulation data service
@@ -360,7 +369,41 @@ namespace OpenSim
360 } 369 }
361 else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); 370 else m_log.Error("[MODULES]: The new RegionModulesController is missing...");
362 371
372 if (m_securePermissionsLoading)
373 {
374 foreach (string s in m_permsModules)
375 {
376 if (!scene.RegionModules.ContainsKey(s))
377 {
378 bool found = false;
379 foreach (IRegionModule m in modules)
380 {
381 if (m.Name == s)
382 {
383 found = true;
384 }
385 }
386 if (!found)
387 {
388 m_log.Fatal("[MODULES]: Required module " + s + " not found.");
389 Environment.Exit(0);
390 }
391 }
392 }
393 }
394
363 scene.SetModuleInterfaces(); 395 scene.SetModuleInterfaces();
396// First Step of bootreport sequence
397 if (scene.SnmpService != null)
398 {
399 scene.SnmpService.ColdStart(1,scene);
400 scene.SnmpService.LinkDown(scene);
401 }
402
403 if (scene.SnmpService != null)
404 {
405 scene.SnmpService.BootInfo("Loading prins", scene);
406 }
364 407
365 // Prims have to be loaded after module configuration since some modules may be invoked during the load 408 // Prims have to be loaded after module configuration since some modules may be invoked during the load
366 scene.LoadPrimsFromStorage(regionInfo.originRegionID); 409 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
@@ -368,6 +411,10 @@ namespace OpenSim
368 // TODO : Try setting resource for region xstats here on scene 411 // TODO : Try setting resource for region xstats here on scene
369 MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 412 MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
370 413
414 if (scene.SnmpService != null)
415 {
416 scene.SnmpService.BootInfo("Grid Registration in progress", scene);
417 }
371 try 418 try
372 { 419 {
373 scene.RegisterRegionWithGrid(); 420 scene.RegisterRegionWithGrid();
@@ -378,11 +425,20 @@ namespace OpenSim
378 "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 425 "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
379 e.Message, e.StackTrace); 426 e.Message, e.StackTrace);
380 427
428 if (scene.SnmpService != null)
429 {
430 scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
431 }
381 // Carrying on now causes a lot of confusion down the 432 // Carrying on now causes a lot of confusion down the
382 // line - we need to get the user's attention 433 // line - we need to get the user's attention
383 Environment.Exit(1); 434 Environment.Exit(1);
384 } 435 }
385 436
437 if (scene.SnmpService != null)
438 {
439 scene.SnmpService.BootInfo("Grid Registration done", scene);
440 }
441
386 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); 442 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
387 scene.EventManager.TriggerParcelPrimCountUpdate(); 443 scene.EventManager.TriggerParcelPrimCountUpdate();
388 444
@@ -390,6 +446,11 @@ namespace OpenSim
390 // scripting engines. 446 // scripting engines.
391 scene.CreateScriptInstances(); 447 scene.CreateScriptInstances();
392 448
449 if (scene.SnmpService != null)
450 {
451 scene.SnmpService.BootInfo("ScriptEngine started", scene);
452 }
453
393 m_sceneManager.Add(scene); 454 m_sceneManager.Add(scene);
394 455
395 if (m_autoCreateClientStack) 456 if (m_autoCreateClientStack)
@@ -398,6 +459,10 @@ namespace OpenSim
398 clientServer.Start(); 459 clientServer.Start();
399 } 460 }
400 461
462 if (scene.SnmpService != null)
463 {
464 scene.SnmpService.BootInfo("Initializing region modules", scene);
465 }
401 if (do_post_init) 466 if (do_post_init)
402 { 467 {
403 foreach (IRegionModule module in modules) 468 foreach (IRegionModule module in modules)
@@ -409,6 +474,12 @@ namespace OpenSim
409 474
410 mscene = scene; 475 mscene = scene;
411 476
477 if (scene.SnmpService != null)
478 {
479 scene.SnmpService.BootInfo("The region is operational", scene);
480 scene.SnmpService.LinkUp(scene);
481 }
482
412 scene.StartTimer(); 483 scene.StartTimer();
413 484
414 return clientServer; 485 return clientServer;
@@ -417,6 +488,11 @@ namespace OpenSim
417 private void ShutdownRegion(Scene scene) 488 private void ShutdownRegion(Scene scene)
418 { 489 {
419 m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName); 490 m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
491 if (scene.SnmpService != null)
492 {
493 scene.SnmpService.BootInfo("The region is shutting down", scene);
494 scene.SnmpService.LinkDown(scene);
495 }
420 IRegionModulesController controller; 496 IRegionModulesController controller;
421 if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller)) 497 if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
422 { 498 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index e9e2dca..9dd6663 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -202,6 +202,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
202 m_stopPacket = TexturePacketCount(); 202 m_stopPacket = TexturePacketCount();
203 } 203 }
204 204
205 //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
206 if (m_stopPacket == 1 && Layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
207
205 m_currentPacket = StartPacket; 208 m_currentPacket = StartPacket;
206 } 209 }
207 } 210 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7851c4d..5419ede 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -155,6 +155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
155 public event RequestTaskInventory OnRequestTaskInventory; 155 public event RequestTaskInventory OnRequestTaskInventory;
156 public event UpdateInventoryItem OnUpdateInventoryItem; 156 public event UpdateInventoryItem OnUpdateInventoryItem;
157 public event CopyInventoryItem OnCopyInventoryItem; 157 public event CopyInventoryItem OnCopyInventoryItem;
158 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
158 public event MoveInventoryItem OnMoveInventoryItem; 159 public event MoveInventoryItem OnMoveInventoryItem;
159 public event RemoveInventoryItem OnRemoveInventoryItem; 160 public event RemoveInventoryItem OnRemoveInventoryItem;
160 public event RemoveInventoryFolder OnRemoveInventoryFolder; 161 public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -335,6 +336,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
335// protected HashSet<uint> m_attachmentsSent; 336// protected HashSet<uint> m_attachmentsSent;
336 337
337 private int m_moneyBalance; 338 private int m_moneyBalance;
339 private bool m_deliverPackets = true;
338 private int m_animationSequenceNumber = 1; 340 private int m_animationSequenceNumber = 1;
339 private bool m_SendLogoutPacketWhenClosing = true; 341 private bool m_SendLogoutPacketWhenClosing = true;
340 private AgentUpdateArgs lastarg; 342 private AgentUpdateArgs lastarg;
@@ -377,6 +379,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
377 get { return m_startpos; } 379 get { return m_startpos; }
378 set { m_startpos = value; } 380 set { m_startpos = value; }
379 } 381 }
382 public bool DeliverPackets
383 {
384 get { return m_deliverPackets; }
385 set {
386 m_deliverPackets = value;
387 m_udpClient.m_deliverPackets = value;
388 }
389 }
380 public UUID AgentId { get { return m_agentId; } } 390 public UUID AgentId { get { return m_agentId; } }
381 public UUID ActiveGroupId { get { return m_activeGroupID; } } 391 public UUID ActiveGroupId { get { return m_activeGroupID; } }
382 public string ActiveGroupName { get { return m_activeGroupName; } } 392 public string ActiveGroupName { get { return m_activeGroupName; } }
@@ -475,18 +485,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
475 485
476 #region Client Methods 486 #region Client Methods
477 487
488
478 /// <summary> 489 /// <summary>
479 /// Shut down the client view 490 /// Shut down the client view
480 /// </summary> 491 /// </summary>
481 public void Close() 492 public void Close()
482 { 493 {
494 Close(true);
495 }
496
497 /// <summary>
498 /// Shut down the client view
499 /// </summary>
500 public void Close(bool sendStop)
501 {
483 m_log.DebugFormat( 502 m_log.DebugFormat(
484 "[CLIENT]: Close has been called for {0} attached to scene {1}", 503 "[CLIENT]: Close has been called for {0} attached to scene {1}",
485 Name, m_scene.RegionInfo.RegionName); 504 Name, m_scene.RegionInfo.RegionName);
486 505
487 // Send the STOP packet 506 if (sendStop)
488 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); 507 {
489 OutPacket(disable, ThrottleOutPacketType.Unknown); 508 // Send the STOP packet
509 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
510 OutPacket(disable, ThrottleOutPacketType.Unknown);
511 }
490 512
491 IsActive = false; 513 IsActive = false;
492 514
@@ -767,7 +789,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
767 reply.ChatData.OwnerID = fromAgentID; 789 reply.ChatData.OwnerID = fromAgentID;
768 reply.ChatData.SourceID = fromAgentID; 790 reply.ChatData.SourceID = fromAgentID;
769 791
770 OutPacket(reply, ThrottleOutPacketType.Task); 792 OutPacket(reply, ThrottleOutPacketType.Unknown);
771 } 793 }
772 794
773 /// <summary> 795 /// <summary>
@@ -1053,6 +1075,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1053 public virtual void SendLayerData(float[] map) 1075 public virtual void SendLayerData(float[] map)
1054 { 1076 {
1055 Util.FireAndForget(DoSendLayerData, map); 1077 Util.FireAndForget(DoSendLayerData, map);
1078
1079 // Send it sync, and async. It's not that much data
1080 // and it improves user experience just so much!
1081 DoSendLayerData(map);
1056 } 1082 }
1057 1083
1058 /// <summary> 1084 /// <summary>
@@ -1065,16 +1091,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1065 1091
1066 try 1092 try
1067 { 1093 {
1068 //for (int y = 0; y < 16; y++) 1094 for (int y = 0; y < 16; y++)
1069 //{ 1095 {
1070 // for (int x = 0; x < 16; x++) 1096 for (int x = 0; x < 16; x+=4)
1071 // { 1097 {
1072 // SendLayerData(x, y, map); 1098 SendLayerPacket(x, y, map);
1073 // } 1099 }
1074 //} 1100 }
1075
1076 // Send LayerData in a spiral pattern. Fun!
1077 SendLayerTopRight(map, 0, 0, 15, 15);
1078 } 1101 }
1079 catch (Exception e) 1102 catch (Exception e)
1080 { 1103 {
@@ -1082,51 +1105,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1082 } 1105 }
1083 } 1106 }
1084 1107
1085 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1086 {
1087 // Row
1088 for (int i = x1; i <= x2; i++)
1089 SendLayerData(i, y1, map);
1090
1091 // Column
1092 for (int j = y1 + 1; j <= y2; j++)
1093 SendLayerData(x2, j, map);
1094
1095 if (x2 - x1 > 0)
1096 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1097 }
1098
1099 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1100 {
1101 // Row in reverse
1102 for (int i = x2; i >= x1; i--)
1103 SendLayerData(i, y2, map);
1104
1105 // Column in reverse
1106 for (int j = y2 - 1; j >= y1; j--)
1107 SendLayerData(x1, j, map);
1108
1109 if (x2 - x1 > 0)
1110 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1111 }
1112
1113 /// <summary> 1108 /// <summary>
1114 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1109 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1115 /// </summary> 1110 /// </summary>
1116 /// <param name="map">heightmap</param> 1111 /// <param name="map">heightmap</param>
1117 /// <param name="px">X coordinate for patches 0..12</param> 1112 /// <param name="px">X coordinate for patches 0..12</param>
1118 /// <param name="py">Y coordinate for patches 0..15</param> 1113 /// <param name="py">Y coordinate for patches 0..15</param>
1119 // private void SendLayerPacket(float[] map, int y, int x) 1114 private void SendLayerPacket(int x, int y, float[] map)
1120 // { 1115 {
1121 // int[] patches = new int[4]; 1116 int[] patches = new int[4];
1122 // patches[0] = x + 0 + y * 16; 1117 patches[0] = x + 0 + y * 16;
1123 // patches[1] = x + 1 + y * 16; 1118 patches[1] = x + 1 + y * 16;
1124 // patches[2] = x + 2 + y * 16; 1119 patches[2] = x + 2 + y * 16;
1125 // patches[3] = x + 3 + y * 16; 1120 patches[3] = x + 3 + y * 16;
1126 1121
1127 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1122 float[] heightmap = (map.Length == 65536) ?
1128 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1123 map :
1129 // } 1124 LLHeightFieldMoronize(map);
1125
1126 try
1127 {
1128 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1129 OutPacket(layerpack, ThrottleOutPacketType.Land);
1130 }
1131 catch
1132 {
1133 for (int px = x ; px < x + 4 ; px++)
1134 SendLayerData(px, y, map);
1135 }
1136 }
1130 1137
1131 /// <summary> 1138 /// <summary>
1132 /// Sends a specified patch to a client 1139 /// Sends a specified patch to a client
@@ -1146,7 +1153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1146 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1153 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1147 layerpack.Header.Reliable = true; 1154 layerpack.Header.Reliable = true;
1148 1155
1149 OutPacket(layerpack, ThrottleOutPacketType.Land); 1156 OutPacket(layerpack, ThrottleOutPacketType.Task);
1150 } 1157 }
1151 catch (Exception e) 1158 catch (Exception e)
1152 { 1159 {
@@ -1507,35 +1514,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1507 OutPacket(pc, ThrottleOutPacketType.Unknown); 1514 OutPacket(pc, ThrottleOutPacketType.Unknown);
1508 } 1515 }
1509 1516
1510 public void SendKillObject(ulong regionHandle, uint localID) 1517 public void SendKillObject(ulong regionHandle, List<uint> localIDs)
1511 { 1518 {
1512// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1519// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
1513 1520
1514 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1521 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1515 // TODO: don't create new blocks if recycling an old packet 1522 // TODO: don't create new blocks if recycling an old packet
1516 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; 1523 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[localIDs.Count];
1517 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); 1524 for (int i = 0 ; i < localIDs.Count ; i++ )
1518 kill.ObjectData[0].ID = localID; 1525 {
1526 kill.ObjectData[i] = new KillObjectPacket.ObjectDataBlock();
1527 kill.ObjectData[i].ID = localIDs[i];
1528 }
1519 kill.Header.Reliable = true; 1529 kill.Header.Reliable = true;
1520 kill.Header.Zerocoded = true; 1530 kill.Header.Zerocoded = true;
1521 1531
1522 if (m_scene.GetScenePresence(localID) == null) 1532 if (localIDs.Count == 1)
1523 { 1533 {
1524 lock (m_entityUpdates.SyncRoot) 1534 if (m_scene.GetScenePresence(localIDs[0]) != null)
1525 { 1535 {
1526 m_killRecord.Add(localID); 1536 OutPacket(kill, ThrottleOutPacketType.State);
1527 1537 return;
1528 // The throttle queue used here must match that being used for updates. Otherwise, there is a
1529 // chance that a kill packet put on a separate queue will be sent to the client before an existing
1530 // update packet on another queue. Receiving updates after kills results in unowned and undeletable
1531 // scene objects in a viewer until that viewer is relogged in.
1532 OutPacket(kill, ThrottleOutPacketType.Task);
1533 } 1538 }
1539 m_killRecord.Add(localIDs[0]);
1534 } 1540 }
1535 else 1541 else
1536 { 1542 {
1537 OutPacket(kill, ThrottleOutPacketType.State); 1543 lock (m_entityUpdates.SyncRoot)
1544 {
1545 foreach (uint localID in localIDs)
1546 m_killRecord.Add(localID);
1547 }
1538 } 1548 }
1549
1550 // The throttle queue used here must match that being used for
1551 // updates. Otherwise, there is a chance that a kill packet put
1552 // on a separate queue will be sent to the client before an
1553 // existing update packet on another queue. Receiving updates
1554 // after kills results in unowned and undeletable
1555 // scene objects in a viewer until that viewer is relogged in.
1556 OutPacket(kill, ThrottleOutPacketType.Task);
1539 } 1557 }
1540 1558
1541 /// <summary> 1559 /// <summary>
@@ -2241,6 +2259,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2241 OutPacket(sound, ThrottleOutPacketType.Task); 2259 OutPacket(sound, ThrottleOutPacketType.Task);
2242 } 2260 }
2243 2261
2262 public void SendTransferAbort(TransferRequestPacket transferRequest)
2263 {
2264 TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
2265 abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
2266 abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
2267 m_log.Debug("[Assets] Aborting transfer; asset request failed");
2268 OutPacket(abort, ThrottleOutPacketType.Task);
2269 }
2270
2244 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 2271 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
2245 { 2272 {
2246 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger); 2273 SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -3542,6 +3569,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3542 /// </summary> 3569 /// </summary>
3543 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3570 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3544 { 3571 {
3572 if (entity is SceneObjectPart)
3573 {
3574 SceneObjectPart e = (SceneObjectPart)entity;
3575 SceneObjectGroup g = e.ParentGroup;
3576 if (g.RootPart.Shape.State > 30) // HUD
3577 if (g.OwnerID != AgentId)
3578 return; // Don't send updates for other people's HUDs
3579 }
3580
3545 double priority = m_prioritizer.GetUpdatePriority(this, entity); 3581 double priority = m_prioritizer.GetUpdatePriority(this, entity);
3546 3582
3547 lock (m_entityUpdates.SyncRoot) 3583 lock (m_entityUpdates.SyncRoot)
@@ -3562,23 +3598,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3562 EntityUpdate update; 3598 EntityUpdate update;
3563 while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update)) 3599 while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update))
3564 { 3600 {
3565 // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client 3601 // If we have sent a kill packet for this object
3566 // will never receive an update after a prim kill. Even then, keeping the kill record may be a good 3602 // drop any updates on the floor
3567 // safety measure.
3568 //
3569 // Receiving updates after kills results in undeleteable prims that persist until relog and
3570 // currently occurs because prims can be deleted before all queued updates are sent.
3571 if (m_killRecord.Contains(update.Entity.LocalId))
3572 {
3573// m_log.WarnFormat(
3574// "[CLIENT]: Preventing full update for prim with local id {0} after client for user {1} told it was deleted",
3575// update.Entity.LocalId, Name);
3576 continue;
3577 }
3578
3579 if (update.Entity is SceneObjectPart) 3603 if (update.Entity is SceneObjectPart)
3580 { 3604 {
3581 SceneObjectPart part = (SceneObjectPart)update.Entity; 3605 SceneObjectPart part = (SceneObjectPart)update.Entity;
3606 if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
3607 continue;
3582 3608
3583 if (part.ParentGroup.IsAttachment && m_disableFacelights) 3609 if (part.ParentGroup.IsAttachment && m_disableFacelights)
3584 { 3610 {
@@ -4012,6 +4038,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4012 { 4038 {
4013 m_propertiesPacketTimer.Stop(); 4039 m_propertiesPacketTimer.Stop();
4014 4040
4041 if (m_propertiesBlocks.Count == 0)
4042 return;
4043
4015 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[m_propertiesBlocks.Count]; 4044 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[m_propertiesBlocks.Count];
4016 4045
4017 int index = 0; 4046 int index = 0;
@@ -4918,6 +4947,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4918 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 4947 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
4919 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 4948 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
4920 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 4949 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
4950 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
4921 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 4951 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
4922 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 4952 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
4923 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 4953 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5017,6 +5047,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5017 (x.CameraLeftAxis != lastarg.CameraLeftAxis) || 5047 (x.CameraLeftAxis != lastarg.CameraLeftAxis) ||
5018 (x.CameraUpAxis != lastarg.CameraUpAxis) || 5048 (x.CameraUpAxis != lastarg.CameraUpAxis) ||
5019 (x.ControlFlags != lastarg.ControlFlags) || 5049 (x.ControlFlags != lastarg.ControlFlags) ||
5050 (x.ControlFlags != 0) ||
5020 (x.Far != lastarg.Far) || 5051 (x.Far != lastarg.Far) ||
5021 (x.Flags != lastarg.Flags) || 5052 (x.Flags != lastarg.Flags) ||
5022 (x.State != lastarg.State) || 5053 (x.State != lastarg.State) ||
@@ -5390,7 +5421,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5390 args.Channel = ch; 5421 args.Channel = ch;
5391 args.From = String.Empty; 5422 args.From = String.Empty;
5392 args.Message = Utils.BytesToString(msg); 5423 args.Message = Utils.BytesToString(msg);
5393 args.Type = ChatTypeEnum.Shout; 5424 args.Type = ChatTypeEnum.Region; //Behaviour in SL is that the response can be heard from any distance
5394 args.Position = new Vector3(); 5425 args.Position = new Vector3();
5395 args.Scene = Scene; 5426 args.Scene = Scene;
5396 args.Sender = this; 5427 args.Sender = this;
@@ -9430,6 +9461,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9430 { 9461 {
9431 return true; 9462 return true;
9432 } 9463 }
9464
9465 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
9466 {
9467 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
9468
9469 #region Packet Session and User Check
9470 if (m_checkPackets)
9471 {
9472 if (packet.AgentData.SessionID != SessionId ||
9473 packet.AgentData.AgentID != AgentId)
9474 return true;
9475 }
9476 #endregion
9477 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
9478 List<InventoryItemBase> items = new List<InventoryItemBase>();
9479 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
9480 {
9481 InventoryItemBase b = new InventoryItemBase();
9482 b.ID = n.OldItemID;
9483 b.Folder = n.OldFolderID;
9484 items.Add(b);
9485 }
9486
9487 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
9488 if (handlerMoveItemsAndLeaveCopy != null)
9489 {
9490 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
9491 }
9492
9493 return true;
9494 }
9433 9495
9434 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 9496 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
9435 { 9497 {
@@ -10927,7 +10989,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10927 { 10989 {
10928 // It's a ghost! tell the client to delete it from view. 10990 // It's a ghost! tell the client to delete it from view.
10929 simClient.SendKillObject(Scene.RegionInfo.RegionHandle, 10991 simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
10930 localId); 10992 new List<uint>() { localId });
10931 } 10993 }
10932 else 10994 else
10933 { 10995 {
@@ -11297,22 +11359,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11297 /// <param name="Pack">OpenMetaverse.packet</param> 11359 /// <param name="Pack">OpenMetaverse.packet</param>
11298 public void ProcessInPacket(Packet packet) 11360 public void ProcessInPacket(Packet packet)
11299 { 11361 {
11300 if (m_debugPacketLevel > 0) 11362 if (m_debugPacketLevel >= 255)
11301 { 11363 m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type);
11302 bool outputPacket = true;
11303
11304 if (m_debugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate)
11305 outputPacket = false;
11306
11307 if (m_debugPacketLevel <= 200 && packet.Type == PacketType.RequestImage)
11308 outputPacket = false;
11309
11310 if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation))
11311 outputPacket = false;
11312
11313 if (outputPacket)
11314 m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type);
11315 }
11316 11364
11317 if (!ProcessPacketMethod(packet)) 11365 if (!ProcessPacketMethod(packet))
11318 m_log.Warn("[CLIENT]: unhandled packet " + packet.Type); 11366 m_log.Warn("[CLIENT]: unhandled packet " + packet.Type);
@@ -11554,7 +11602,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11554 11602
11555// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); 11603// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
11556 11604
11605
11606 //Note, the bool returned from the below function is useless since it is always false.
11557 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 11607 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
11608
11558 } 11609 }
11559 11610
11560 /// <summary> 11611 /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index c4db5da..ed0e60d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -149,6 +149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
149 149
150 private int m_defaultRTO = 3000; 150 private int m_defaultRTO = 3000;
151 private int m_maxRTO = 60000; 151 private int m_maxRTO = 60000;
152 public bool m_deliverPackets = true;
152 153
153 /// <summary> 154 /// <summary>
154 /// Default constructor 155 /// Default constructor
@@ -406,6 +407,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
406 if (category >= 0 && category < m_packetOutboxes.Length) 407 if (category >= 0 && category < m_packetOutboxes.Length)
407 { 408 {
408 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category]; 409 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
410
411 if (m_deliverPackets == false)
412 {
413 queue.Enqueue(packet);
414 return true;
415 }
416
409 TokenBucket bucket = m_throttleCategories[category]; 417 TokenBucket bucket = m_throttleCategories[category];
410 418
411 if (bucket.RemoveTokens(packet.Buffer.DataLength)) 419 if (bucket.RemoveTokens(packet.Buffer.DataLength))
@@ -442,6 +450,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
442 /// <returns>True if any packets were sent, otherwise false</returns> 450 /// <returns>True if any packets were sent, otherwise false</returns>
443 public bool DequeueOutgoing() 451 public bool DequeueOutgoing()
444 { 452 {
453 if (m_deliverPackets == false) return false;
454
445 OutgoingPacket packet; 455 OutgoingPacket packet;
446 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue; 456 OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
447 TokenBucket bucket; 457 TokenBucket bucket;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index b5d8ec8..59968a1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -934,7 +934,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
934 if (m_scene.TryGetClient(udpClient.AgentID, out client)) 934 if (m_scene.TryGetClient(udpClient.AgentID, out client))
935 { 935 {
936 client.IsLoggingOut = true; 936 client.IsLoggingOut = true;
937 client.Close(); 937 client.Close(false);
938 } 938 }
939 } 939 }
940 940
diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index bdbd284..91e3d20 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
133 this.parent = parent; 133 this.parent = parent;
134 MaxBurst = maxBurst; 134 MaxBurst = maxBurst;
135 DripRate = dripRate; 135 DripRate = dripRate;
136 lastDrip = Environment.TickCount & Int32.MaxValue; 136 lastDrip = Environment.TickCount;
137 } 137 }
138 138
139 /// <summary> 139 /// <summary>
@@ -144,40 +144,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
144 /// the bucket, otherwise false</returns> 144 /// the bucket, otherwise false</returns>
145 public bool RemoveTokens(int amount) 145 public bool RemoveTokens(int amount)
146 { 146 {
147 bool dummy;
148 return RemoveTokens(amount, out dummy);
149 }
150
151 /// <summary>
152 /// Remove a given number of tokens from the bucket
153 /// </summary>
154 /// <param name="amount">Number of tokens to remove from the bucket</param>
155 /// <param name="dripSucceeded">True if tokens were added to the bucket
156 /// during this call, otherwise false</param>
157 /// <returns>True if the requested number of tokens were removed from
158 /// the bucket, otherwise false</returns>
159 public bool RemoveTokens(int amount, out bool dripSucceeded)
160 {
161 if (maxBurst == 0) 147 if (maxBurst == 0)
162 { 148 {
163 dripSucceeded = true;
164 return true; 149 return true;
165 } 150 }
166 151
167 dripSucceeded = Drip(); 152 if (amount > maxBurst)
168
169 if (content - amount >= 0)
170 { 153 {
171 if (parent != null && !parent.RemoveTokens(amount)) 154 throw new Exception("amount " + amount + " exceeds maxBurst " + maxBurst);
172 return false; 155 }
173 156
174 content -= amount; 157 Drip();
175 return true; 158
159 if (content < amount)
160 {
161 return false;
176 } 162 }
177 else 163
164 if (parent != null && !parent.RemoveTokens(amount))
178 { 165 {
179 return false; 166 return false;
180 } 167 }
168
169 content -= amount;
170 return true;
181 } 171 }
182 172
183 /// <summary> 173 /// <summary>
@@ -193,25 +183,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
193 content = maxBurst; 183 content = maxBurst;
194 return true; 184 return true;
195 } 185 }
196 else
197 {
198 int now = Environment.TickCount & Int32.MaxValue;
199 int deltaMS = now - lastDrip;
200 186
201 if (deltaMS <= 0) 187 int now = Environment.TickCount;
202 { 188 int deltaMS = now - lastDrip;
203 if (deltaMS < 0) 189 lastDrip = now;
204 lastDrip = now;
205 return false;
206 }
207 190
208 int dripAmount = deltaMS * tokensPerMS; 191 if (deltaMS <= 0)
209 192 {
210 content = Math.Min(content + dripAmount, maxBurst); 193 return false;
211 lastDrip = now; 194 }
212 195
213 return true; 196 long dripAmount = (long)deltaMS * (long)tokensPerMS + (long)content;
197 if (dripAmount > maxBurst)
198 {
199 dripAmount = maxBurst;
214 } 200 }
201 content = (int)dripAmount;
202 return true;
215 } 203 }
216 } 204 }
217} 205}
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 1744fb3..fc92fc3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Xml;
31using log4net; 32using log4net;
32using Mono.Addins; 33using Mono.Addins;
33using Nini.Config; 34using Nini.Config;
@@ -233,15 +234,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
233 public UUID RezSingleAttachmentFromInventory( 234 public UUID RezSingleAttachmentFromInventory(
234 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) 235 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
235 { 236 {
236 m_log.DebugFormat( 237 return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true, null);
237 "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", 238 }
238 (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); 239
239 240 public UUID RezSingleAttachmentFromInventory(
241 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
242 {
240 // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should 243 // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should
241 // be removed when that functionality is implemented in opensim 244 // be removed when that functionality is implemented in opensim
242 AttachmentPt &= 0x7f; 245 AttachmentPt &= 0x7f;
243 246
244 SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); 247 SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt, doc);
245 248
246 if (updateInventoryStatus) 249 if (updateInventoryStatus)
247 { 250 {
@@ -258,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
258 } 261 }
259 262
260 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( 263 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
261 IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 264 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, XmlDocument doc)
262 { 265 {
263 IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); 266 IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
264 if (invAccess != null) 267 if (invAccess != null)
@@ -296,13 +299,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
296 if (tainted) 299 if (tainted)
297 objatt.HasGroupChanged = true; 300 objatt.HasGroupChanged = true;
298 301
302 if (doc != null)
303 {
304 objatt.LoadScriptState(doc);
305 objatt.ResetOwnerChangeFlag();
306 }
307
299 // Fire after attach, so we don't get messy perms dialogs 308 // Fire after attach, so we don't get messy perms dialogs
300 // 4 == AttachedRez 309 // 4 == AttachedRez
301 objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4); 310 objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
302 objatt.ResumeScripts(); 311 objatt.ResumeScripts();
303 312
304 // Do this last so that event listeners have access to all the effects of the attachment 313 // Do this last so that event listeners have access to all the effects of the attachment
305 m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId); 314 //m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
306 } 315 }
307 else 316 else
308 { 317 {
@@ -339,9 +348,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
339 if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) 348 if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
340 { 349 {
341 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 350 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
342 item = m_scene.InventoryService.GetItem(item); 351 if (m_scene.InventoryService != null)
352 item = m_scene.InventoryService.GetItem(item);
343 353
344 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 354 if (presence.Appearance != null)
355 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
345 } 356 }
346 357
347 return att.UUID; 358 return att.UUID;
@@ -384,6 +395,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
384 { 395 {
385 // XXYY!! 396 // XXYY!!
386 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 397 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
398 if (item == null)
399 m_log.Error("[ATTACHMENT]: item == null");
400 if (m_scene == null)
401 m_log.Error("[ATTACHMENT]: m_scene == null");
402 if (m_scene.InventoryService == null)
403 m_log.Error("[ATTACHMENT]: m_scene.InventoryService == null");
387 item = m_scene.InventoryService.GetItem(item); 404 item = m_scene.InventoryService.GetItem(item);
388 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */); 405 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
389 406
@@ -472,6 +489,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
472 if (group.GetFromItemID() == itemID) 489 if (group.GetFromItemID() == itemID)
473 { 490 {
474 m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero); 491 m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
492 // CM / XMREngine!!!! Needed to conclude attach event
493 //SceneObjectSerializer.ToOriginalXmlFormat(group);
475 group.DetachToInventoryPrep(); 494 group.DetachToInventoryPrep();
476 m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); 495 m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
477 496
@@ -598,7 +617,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
598 // 617 //
599 if (so.IsSelected) 618 if (so.IsSelected)
600 { 619 {
601 m_scene.SendKillObject(so.RootPart.LocalId); 620 m_scene.SendKillObject(new List<uint> { so.RootPart.LocalId });
602 } 621 }
603 622
604 so.IsSelected = false; // fudge.... 623 so.IsSelected = false; // fudge....
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 4359c01..35a3f43 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -49,7 +49,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
49 private int m_shoutdistance = 100; 49 private int m_shoutdistance = 100;
50 private int m_whisperdistance = 10; 50 private int m_whisperdistance = 10;
51 private List<Scene> m_scenes = new List<Scene>(); 51 private List<Scene> m_scenes = new List<Scene>();
52 52 private List<string> FreezeCache = new List<string>();
53 private string m_adminPrefix = "";
53 internal object m_syncy = new object(); 54 internal object m_syncy = new object();
54 55
55 internal IConfig m_config; 56 internal IConfig m_config;
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
76 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); 77 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
77 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); 78 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
78 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); 79 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
80 m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", "");
79 } 81 }
80 82
81 public virtual void AddRegion(Scene scene) 83 public virtual void AddRegion(Scene scene)
@@ -171,7 +173,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
171 return; 173 return;
172 } 174 }
173 175
174 DeliverChatToAvatars(ChatSourceType.Agent, c); 176 if (FreezeCache.Contains(c.Sender.AgentId.ToString()))
177 {
178 if (c.Type != ChatTypeEnum.StartTyping || c.Type != ChatTypeEnum.StopTyping)
179 c.Sender.SendAgentAlertMessage("You may not talk as you are frozen.", false);
180 }
181 else
182 {
183 DeliverChatToAvatars(ChatSourceType.Agent, c);
184 }
175 } 185 }
176 186
177 public virtual void OnChatFromWorld(Object sender, OSChatMessage c) 187 public virtual void OnChatFromWorld(Object sender, OSChatMessage c)
@@ -185,6 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
185 protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c) 195 protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
186 { 196 {
187 string fromName = c.From; 197 string fromName = c.From;
198 string fromNamePrefix = "";
188 UUID fromID = UUID.Zero; 199 UUID fromID = UUID.Zero;
189 string message = c.Message; 200 string message = c.Message;
190 IScene scene = c.Scene; 201 IScene scene = c.Scene;
@@ -207,7 +218,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
207 fromPos = avatar.AbsolutePosition; 218 fromPos = avatar.AbsolutePosition;
208 fromName = avatar.Name; 219 fromName = avatar.Name;
209 fromID = c.Sender.AgentId; 220 fromID = c.Sender.AgentId;
210 221 if (avatar.GodLevel >= 200)
222 {
223 fromNamePrefix = m_adminPrefix;
224 }
211 break; 225 break;
212 226
213 case ChatSourceType.Object: 227 case ChatSourceType.Object:
@@ -231,8 +245,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
231 s.ForEachScenePresence( 245 s.ForEachScenePresence(
232 delegate(ScenePresence presence) 246 delegate(ScenePresence presence)
233 { 247 {
234 if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType)) 248 ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
235 receiverIDs.Add(presence.UUID); 249 if (Presencecheck != null)
250 {
251 // This will pass all chat from objects. Not
252 // perfect, but it will do. For now. Better
253 // than the prior behavior of muting all
254 // objects on a parcel with access restrictions
255 if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
256 {
257 if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType))
258 receiverIDs.Add(presence.UUID);
259 }
260 }
261
236 } 262 }
237 ); 263 );
238 } 264 }
@@ -276,31 +302,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
276 } 302 }
277 303
278 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); 304 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
279
280 HashSet<UUID> receiverIDs = new HashSet<UUID>(); 305 HashSet<UUID> receiverIDs = new HashSet<UUID>();
281 306
282 ((Scene)c.Scene).ForEachScenePresence( 307 if (c.Scene != null)
283 delegate(ScenePresence presence) 308 {
284 { 309 ((Scene)c.Scene).ForEachScenePresence
285 // ignore chat from child agents 310 (
286 if (presence.IsChildAgent) return; 311 delegate(ScenePresence presence)
287 312 {
288 IClientAPI client = presence.ControllingClient; 313 // ignore chat from child agents
289 314 if (presence.IsChildAgent) return;
290 // don't forward SayOwner chat from objects to 315
291 // non-owner agents 316 IClientAPI client = presence.ControllingClient;
292 if ((c.Type == ChatTypeEnum.Owner) && 317
293 (null != c.SenderObject) && 318 // don't forward SayOwner chat from objects to
294 (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) 319 // non-owner agents
295 return; 320 if ((c.Type == ChatTypeEnum.Owner) &&
296 321 (null != c.SenderObject) &&
297 client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 322 (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
298 (byte)sourceType, (byte)ChatAudibleLevel.Fully); 323 return;
299 receiverIDs.Add(presence.UUID); 324
300 }); 325 client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID,
301 326 (byte)sourceType, (byte)ChatAudibleLevel.Fully);
302 (c.Scene as Scene).EventManager.TriggerOnChatToClients( 327 receiverIDs.Add(presence.UUID);
303 fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully); 328 }
329 );
330 (c.Scene as Scene).EventManager.TriggerOnChatToClients(
331 fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
332 }
304 } 333 }
305 334
306 /// <summary> 335 /// <summary>
@@ -343,5 +372,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
343 372
344 return true; 373 return true;
345 } 374 }
375
376 Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
377 public void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
378 {
379 System.Threading.Timer Timer;
380 if (flags == 0)
381 {
382 FreezeCache.Add(target.ToString());
383 System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
384 Timer = new System.Threading.Timer(timeCB, target, 30000, 0);
385 Timers.Add(target, Timer);
386 }
387 else
388 {
389 FreezeCache.Remove(target.ToString());
390 Timers.TryGetValue(target, out Timer);
391 Timers.Remove(target);
392 Timer.Dispose();
393 }
394 }
395
396 private void OnEndParcelFrozen(object avatar)
397 {
398 UUID target = (UUID)avatar;
399 FreezeCache.Remove(target.ToString());
400 System.Threading.Timer Timer;
401 Timers.TryGetValue(target, out Timer);
402 Timers.Remove(target);
403 Timer.Dispose();
404 }
346 } 405 }
347} 406}
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 2b3d2a9..a514a83 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -239,4 +239,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
239 return result; 239 return result;
240 } 240 }
241 } 241 }
242} \ No newline at end of file 242}
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index b3f0a25..45c3f49 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
273 273
274 // Inform the friends that this user is online 274 // Inform the friends that this user is online
275 StatusChange(agentID, true); 275 StatusChange(agentID, true);
276 276
277 // Register that we need to send the list of online friends to this user 277 // Register that we need to send the list of online friends to this user
278 lock (m_NeedsListOfFriends) 278 lock (m_NeedsListOfFriends)
279 m_NeedsListOfFriends.Add(agentID); 279 m_NeedsListOfFriends.Add(agentID);
@@ -701,7 +701,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
701 // we're done 701 // we're done
702 return true; 702 return true;
703 } 703 }
704 704
705 return false; 705 return false;
706 } 706 }
707 707
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index af39565..347708d 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
156 return; 156 return;
157 } 157 }
158 158
159 DateTime dt = DateTime.UtcNow;
160
161 // Ticks from UtcNow, but make it look like local. Evil, huh?
162 dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
163
164 try
165 {
166 // Convert that to the PST timezone
167 TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
168 dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
169 }
170 catch
171 {
172 //m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp.");
173 }
174
175 // And make it look local again to fool the unix time util
176 dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
177
178 im.timestamp = (uint)Util.ToUnixTime(dt);
179
180 // If client is null, this message comes from storage and IS offline
181 if (client != null)
182 im.offline = 0;
183
159 if (m_TransferModule != null) 184 if (m_TransferModule != null)
160 { 185 {
161 if (client != null) 186 if (client != null)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 918fa04..d8e0f96 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -145,8 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
145 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 145 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
146 if (!user.IsChildAgent) 146 if (!user.IsChildAgent)
147 { 147 {
148 // Local message 148 // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
149 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
150 user.ControllingClient.SendInstantMessage(im); 149 user.ControllingClient.SendInstantMessage(im);
151 150
152 // Message sent 151 // Message sent
@@ -168,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
168 // Local message 167 // Local message
169 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 168 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
170 169
171 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID); 170 // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
172 user.ControllingClient.SendInstantMessage(im); 171 user.ControllingClient.SendInstantMessage(im);
173 172
174 // Message sent 173 // Message sent
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index fdfcd10..d3db5b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -172,13 +172,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
172 172
173 private void RetrieveInstantMessages(IClientAPI client) 173 private void RetrieveInstantMessages(IClientAPI client)
174 { 174 {
175 if (m_RestURL != "") 175 if (m_RestURL == String.Empty)
176 { 176 return;
177 m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
178 177
179 List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( 178 m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
179
180 List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
180 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); 181 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
181 182
183 if (msglist != null)
184 {
182 foreach (GridInstantMessage im in msglist) 185 foreach (GridInstantMessage im in msglist)
183 { 186 {
184 // client.SendInstantMessage(im); 187 // client.SendInstantMessage(im);
@@ -189,6 +192,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
189 // Needed for proper state management for stored group 192 // Needed for proper state management for stored group
190 // invitations 193 // invitations
191 // 194 //
195
196 im.offline = 1;
197
198 // Reconstruct imSessionID
199 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
200 {
201 UUID fromAgentID = new UUID(im.fromAgentID);
202 UUID sessionID = fromAgentID ^ client.AgentId;
203 im.imSessionID = new Guid(sessionID.ToString());
204 }
205
192 Scene s = FindScene(client.AgentId); 206 Scene s = FindScene(client.AgentId);
193 if (s != null) 207 if (s != null)
194 s.EventManager.TriggerIncomingInstantMessage(im); 208 s.EventManager.TriggerIncomingInstantMessage(im);
@@ -198,26 +212,38 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
198 212
199 private void UndeliveredMessage(GridInstantMessage im) 213 private void UndeliveredMessage(GridInstantMessage im)
200 { 214 {
201 if ((im.offline != 0) 215 if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&
202 && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) 216 im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
217 im.dialog != (byte)InstantMessageDialog.GroupNotice &&
218 im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
219 im.dialog != (byte)InstantMessageDialog.InventoryOffered)
203 { 220 {
204 bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( 221 return;
205 "POST", m_RestURL+"/SaveMessage/", im); 222 }
206 223
207 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) 224 // It's not delivered. Make sure the scope id is saved
208 { 225 // We don't need the imSessionID here anymore, overwrite it
209 IClientAPI client = FindClient(new UUID(im.fromAgentID)); 226 Scene scene = FindScene(new UUID(im.fromAgentID));
210 if (client == null) 227 if (scene == null)
211 return; 228 scene = m_SceneList[0];
212 229 im.imSessionID = new Guid(scene.RegionInfo.ScopeID.ToString());
213 client.SendInstantMessage(new GridInstantMessage( 230
214 null, new UUID(im.toAgentID), 231 bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
215 "System", new UUID(im.fromAgentID), 232 "POST", m_RestURL+"/SaveMessage/", im);
216 (byte)InstantMessageDialog.MessageFromAgent, 233
217 "User is not logged in. "+ 234 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
218 (success ? "Message saved." : "Message not saved"), 235 {
219 false, new Vector3())); 236 IClientAPI client = FindClient(new UUID(im.fromAgentID));
220 } 237 if (client == null)
238 return;
239
240 client.SendInstantMessage(new GridInstantMessage(
241 null, new UUID(im.toAgentID),
242 "System", new UUID(im.fromAgentID),
243 (byte)InstantMessageDialog.MessageFromAgent,
244 "User is not logged in. "+
245 (success ? "Message saved." : "Message not saved"),
246 false, new Vector3()));
221 } 247 }
222 } 248 }
223 } 249 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e3d4969..528bc8d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -175,8 +175,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
175 if (im.binaryBucket.Length < 17) // Invalid 175 if (im.binaryBucket.Length < 17) // Invalid
176 return; 176 return;
177 177
178 UUID receipientID = new UUID(im.toAgentID); 178 UUID recipientID = new UUID(im.toAgentID);
179 ScenePresence user = scene.GetScenePresence(receipientID); 179 ScenePresence user = scene.GetScenePresence(recipientID);
180 UUID copyID; 180 UUID copyID;
181 181
182 // First byte is the asset type 182 // First byte is the asset type
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
191 folderID, new UUID(im.toAgentID)); 191 folderID, new UUID(im.toAgentID));
192 192
193 InventoryFolderBase folderCopy 193 InventoryFolderBase folderCopy
194 = scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero); 194 = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero);
195 195
196 if (folderCopy == null) 196 if (folderCopy == null)
197 { 197 {
@@ -248,6 +248,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
248 im.imSessionID = itemID.Guid; 248 im.imSessionID = itemID.Guid;
249 } 249 }
250 250
251 im.offline = 1; // Remember these
252
251 // Send the IM to the recipient. The item is already 253 // Send the IM to the recipient. The item is already
252 // in their inventory, so it will not be lost if 254 // in their inventory, so it will not be lost if
253 // they are offline. 255 // they are offline.
@@ -417,22 +419,67 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
417 /// 419 ///
418 /// </summary> 420 /// </summary>
419 /// <param name="msg"></param> 421 /// <param name="msg"></param>
420 private void OnGridInstantMessage(GridInstantMessage msg) 422 private void OnGridInstantMessage(GridInstantMessage im)
421 { 423 {
422 // Check if this is ours to handle 424 // Check if this is ours to handle
423 // 425 //
424 Scene scene = FindClientScene(new UUID(msg.toAgentID)); 426 Scene scene = FindClientScene(new UUID(im.toAgentID));
425 427
426 if (scene == null) 428 if (scene == null)
427 return; 429 return;
428 430
429 // Find agent to deliver to 431 // Find agent to deliver to
430 // 432 //
431 ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID)); 433 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
434 if (user == null)
435 return;
436
437 // This requires a little bit of processing because we have to make the
438 // new item visible in the recipient's inventory here
439 //
440 if (im.dialog == (byte) InstantMessageDialog.InventoryOffered)
441 {
442 if (im.binaryBucket.Length < 17) // Invalid
443 return;
444
445 UUID recipientID = new UUID(im.toAgentID);
446
447 // First byte is the asset type
448 AssetType assetType = (AssetType)im.binaryBucket[0];
449
450 if (AssetType.Folder == assetType)
451 {
452 UUID folderID = new UUID(im.binaryBucket, 1);
453
454 InventoryFolderBase given =
455 new InventoryFolderBase(folderID, recipientID);
456 InventoryFolderBase folder =
457 scene.InventoryService.GetFolder(given);
458
459 if (folder != null)
460 user.ControllingClient.SendBulkUpdateInventory(folder);
461 }
462 else
463 {
464 UUID itemID = new UUID(im.binaryBucket, 1);
432 465
433 // Just forward to local handling 466 InventoryItemBase given =
434 OnInstantMessage(user.ControllingClient, msg); 467 new InventoryItemBase(itemID, recipientID);
468 InventoryItemBase item =
469 scene.InventoryService.GetItem(given);
435 470
471 if (item != null)
472 {
473 user.ControllingClient.SendBulkUpdateInventory(item);
474 }
475 }
476 user.ControllingClient.SendInstantMessage(im);
477 }
478 else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
479 im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
480 {
481 user.ControllingClient.SendInstantMessage(im);
482 }
436 } 483 }
437 } 484 }
438} 485}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index f02a922..81d6f70 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
99 99
100 protected virtual void OnNewClient(IClientAPI client) 100 protected virtual void OnNewClient(IClientAPI client)
101 { 101 {
102 client.OnTeleportHomeRequest += TeleportHome; 102 client.OnTeleportHomeRequest += TeleportHomeFired;
103 } 103 }
104 104
105 public virtual void Close() 105 public virtual void Close()
@@ -269,7 +269,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
269 // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, 269 // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
270 // it's actually doing a lot of work. 270 // it's actually doing a lot of work.
271 IPEndPoint endPoint = finalDestination.ExternalEndPoint; 271 IPEndPoint endPoint = finalDestination.ExternalEndPoint;
272 if (endPoint.Address != null) 272 if (endPoint != null && endPoint.Address != null)
273 { 273 {
274 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from 274 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
275 // both regions 275 // both regions
@@ -529,7 +529,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
529 529
530 protected void KillEntity(Scene scene, uint localID) 530 protected void KillEntity(Scene scene, uint localID)
531 { 531 {
532 scene.SendKillObject(localID); 532 scene.SendKillObject(new List<uint>() { localID });
533 } 533 }
534 534
535 protected virtual GridRegion GetFinalDestination(GridRegion region) 535 protected virtual GridRegion GetFinalDestination(GridRegion region)
@@ -567,7 +567,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
567 567
568 #region Teleport Home 568 #region Teleport Home
569 569
570 public virtual void TeleportHome(UUID id, IClientAPI client) 570 public void TeleportHomeFired(UUID id, IClientAPI client)
571 {
572 TeleportHome(id, client);
573 }
574
575 public virtual bool TeleportHome(UUID id, IClientAPI client)
571 { 576 {
572 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName); 577 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
573 578
@@ -576,12 +581,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
576 581
577 if (uinfo != null) 582 if (uinfo != null)
578 { 583 {
584 if (uinfo.HomeRegionID == UUID.Zero)
585 {
586 // can't find the Home region: Tell viewer and abort
587 client.SendTeleportFailed("You don't have a home position set.");
588 return false;
589 }
579 GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID); 590 GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
580 if (regionInfo == null) 591 if (regionInfo == null)
581 { 592 {
582 // can't find the Home region: Tell viewer and abort 593 // can't find the Home region: Tell viewer and abort
583 client.SendTeleportFailed("Your home region could not be found."); 594 client.SendTeleportFailed("Your home region could not be found.");
584 return; 595 return false;
585 } 596 }
586 597
587 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", 598 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})",
@@ -592,6 +603,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
592 client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt, 603 client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt,
593 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); 604 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
594 } 605 }
606 else
607 {
608 // can't find the Home region: Tell viewer and abort
609 client.SendTeleportFailed("Your home region could not be found.");
610 return false;
611 }
612 return true;
595 } 613 }
596 614
597 #endregion 615 #endregion
@@ -879,15 +897,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
879 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); 897 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
880 898
881 IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>(); 899 IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>();
882 if (eq != null) 900 IPEndPoint neighbourExternal = neighbourRegion.ExternalEndPoint;
901 if (neighbourExternal != null)
883 { 902 {
884 eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint, 903 if (eq != null)
885 capsPath, agent.UUID, agent.ControllingClient.SessionId); 904 {
886 } 905 eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourExternal,
887 else 906 capsPath, agent.UUID, agent.ControllingClient.SessionId);
888 { 907 }
889 agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint, 908 else
890 capsPath); 909 {
910 agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourExternal,
911 capsPath);
912 }
891 } 913 }
892 914
893 if (!WaitForCallback(agent.UUID)) 915 if (!WaitForCallback(agent.UUID))
@@ -989,10 +1011,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
989 agent.Id0 = currentAgentCircuit.Id0; 1011 agent.Id0 = currentAgentCircuit.Id0;
990 } 1012 }
991 1013
992 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 1014 IPEndPoint external = region.ExternalEndPoint;
993 d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true, 1015 if (external != null)
1016 {
1017 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
1018 d.BeginInvoke(sp, agent, region, external, true,
994 InformClientOfNeighbourCompleted, 1019 InformClientOfNeighbourCompleted,
995 d); 1020 d);
1021 }
996 } 1022 }
997 #endregion 1023 #endregion
998 1024
@@ -1125,6 +1151,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1125 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 1151 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
1126 try 1152 try
1127 { 1153 {
1154 //neighbour.ExternalEndPoint may return null, which will be caught
1128 d.BeginInvoke(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent, 1155 d.BeginInvoke(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent,
1129 InformClientOfNeighbourCompleted, 1156 InformClientOfNeighbourCompleted,
1130 d); 1157 d);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 1ac7508..47898cc 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
86 86
87 protected override void OnNewClient(IClientAPI client) 87 protected override void OnNewClient(IClientAPI client)
88 { 88 {
89 client.OnTeleportHomeRequest += TeleportHome; 89 client.OnTeleportHomeRequest += TeleportHomeFired;
90 client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed); 90 client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
91 } 91 }
92 92
@@ -174,7 +174,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
174 return m_aScene.SimulationService.CreateAgent(reg, agentCircuit, teleportFlags, out reason); 174 return m_aScene.SimulationService.CreateAgent(reg, agentCircuit, teleportFlags, out reason);
175 } 175 }
176 176
177 public override void TeleportHome(UUID id, IClientAPI client) 177 public void TeleportHomeFired(UUID id, IClientAPI client)
178 {
179 TeleportHome(id, client);
180 }
181
182 public override bool TeleportHome(UUID id, IClientAPI client)
178 { 183 {
179 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName); 184 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
180 185
@@ -184,8 +189,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
184 { 189 {
185 // local grid user 190 // local grid user
186 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local"); 191 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
187 base.TeleportHome(id, client); 192 return base.TeleportHome(id, client);
188 return;
189 } 193 }
190 194
191 // Foreign user wants to go home 195 // Foreign user wants to go home
@@ -195,7 +199,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
195 { 199 {
196 client.SendTeleportFailed("Your information has been lost"); 200 client.SendTeleportFailed("Your information has been lost");
197 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information"); 201 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
198 return; 202 return false;
199 } 203 }
200 204
201 IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString()); 205 IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
@@ -205,7 +209,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
205 { 209 {
206 client.SendTeleportFailed("Your home region could not be found"); 210 client.SendTeleportFailed("Your home region could not be found");
207 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found"); 211 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
208 return; 212 return false;
209 } 213 }
210 214
211 ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId); 215 ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
@@ -213,7 +217,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
213 { 217 {
214 client.SendTeleportFailed("Internal error"); 218 client.SendTeleportFailed("Internal error");
215 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be"); 219 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
216 return; 220 return false;
217 } 221 }
218 222
219 IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); 223 IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
@@ -223,6 +227,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
223 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName); 227 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName);
224 228
225 DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq); 229 DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
230 return true;
226 } 231 }
227 #endregion 232 #endregion
228 233
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 67732ff..2e3db48 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Xml;
31using System.Reflection; 32using System.Reflection;
32using System.Threading; 33using System.Threading;
33 34
@@ -191,11 +192,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
191 public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, 192 public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
192 List<SceneObjectGroup> objectGroups, IClientAPI remoteClient) 193 List<SceneObjectGroup> objectGroups, IClientAPI remoteClient)
193 { 194 {
194 // HACK: This is only working for lists containing a single item!
195 // It's just a hack to make this WIP compile and run. Nothing
196 // currently calls this with multiple items.
197 UUID ret = UUID.Zero; 195 UUID ret = UUID.Zero;
198 196
197 // The following code groups the SOG's by owner. No objects
198 // belonging to different people can be coalesced, for obvious
199 // reasons.
199 Dictionary<UUID, List<SceneObjectGroup>> deletes = 200 Dictionary<UUID, List<SceneObjectGroup>> deletes =
200 new Dictionary<UUID, List<SceneObjectGroup>>(); 201 new Dictionary<UUID, List<SceneObjectGroup>>();
201 202
@@ -207,265 +208,334 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
207 deletes[g.OwnerID].Add(g); 208 deletes[g.OwnerID].Add(g);
208 } 209 }
209 210
211 // This is pethod scoped and will be returned. It will be the
212 // last created asset id
213 UUID assetID = UUID.Zero;
214
215 // Each iteration is really a separate asset being created,
216 // with distinct destinations as well.
210 foreach (List<SceneObjectGroup> objlist in deletes.Values) 217 foreach (List<SceneObjectGroup> objlist in deletes.Values)
211 { 218 {
212 foreach (SceneObjectGroup g in objlist) 219 Dictionary<UUID, string> xmlStrings =
213 ret = DeleteToInventory(action, folderID, g, remoteClient); 220 new Dictionary<UUID, string>();
214 }
215 221
216 return ret; 222 foreach (SceneObjectGroup objectGroup in objlist)
217 } 223 {
224 Vector3 inventoryStoredPosition = new Vector3
225 (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
226 ? 250
227 : objectGroup.AbsolutePosition.X)
228 ,
229 (objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
230 ? 250
231 : objectGroup.AbsolutePosition.X,
232 objectGroup.AbsolutePosition.Z);
218 233
219 private UUID DeleteToInventory(DeRezAction action, UUID folderID, 234 Vector3 originalPosition = objectGroup.AbsolutePosition;
220 SceneObjectGroup objectGroup, IClientAPI remoteClient)
221 {
222 UUID assetID = UUID.Zero;
223 235
224 Vector3 inventoryStoredPosition = new Vector3 236 // Restore attachment data after trip through the sim
225 (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize) 237 if (objectGroup.RootPart.AttachPoint > 0)
226 ? 250 238 inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
227 : objectGroup.AbsolutePosition.X) 239 objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
228 ,
229 (objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
230 ? 250
231 : objectGroup.AbsolutePosition.X,
232 objectGroup.AbsolutePosition.Z);
233 240
234 Vector3 originalPosition = objectGroup.AbsolutePosition; 241 objectGroup.AbsolutePosition = inventoryStoredPosition;
235 242
236 objectGroup.AbsolutePosition = inventoryStoredPosition; 243 // Make sure all bits but the ones we want are clear
244 // on take.
245 // This will be applied to the current perms, so
246 // it will do what we want.
247 objectGroup.RootPart.NextOwnerMask &=
248 ((uint)PermissionMask.Copy |
249 (uint)PermissionMask.Transfer |
250 (uint)PermissionMask.Modify);
251 objectGroup.RootPart.NextOwnerMask |=
252 (uint)PermissionMask.Move;
237 253
238 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); 254 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
239 255
240 objectGroup.AbsolutePosition = originalPosition; 256 objectGroup.AbsolutePosition = originalPosition;
241 257
242 // Get the user info of the item destination 258 xmlStrings[objectGroup.UUID] = sceneObjectXml;
243 // 259 }
244 UUID userID = UUID.Zero;
245 260
246 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy || 261 string itemXml;
247 action == DeRezAction.SaveToExistingUserInventoryItem)
248 {
249 // Take or take copy require a taker
250 // Saving changes requires a local user
251 //
252 if (remoteClient == null)
253 return UUID.Zero;
254 262
255 userID = remoteClient.AgentId; 263 if (objlist.Count > 1)
256 } 264 {
257 else 265 float minX, minY, minZ;
258 { 266 float maxX, maxY, maxZ;
259 // All returns / deletes go to the object owner
260 //
261 267
262 userID = objectGroup.RootPart.OwnerID; 268 Vector3[] offsets = m_Scene.GetCombinedBoundingBox(objlist,
263 } 269 out minX, out maxX, out minY, out maxY,
270 out minZ, out maxZ);
264 271
265 if (userID == UUID.Zero) // Can't proceed 272 // CreateWrapper
266 { 273 XmlDocument itemDoc = new XmlDocument();
267 return UUID.Zero; 274 XmlElement root = itemDoc.CreateElement("", "CoalescedObject", "");
268 } 275 itemDoc.AppendChild(root);
269 276
270 // If we're returning someone's item, it goes back to the 277 // Embed the offsets into the group XML
271 // owner's Lost And Found folder. 278 for ( int i = 0 ; i < objlist.Count ; i++ )
272 // Delete is treated like return in this case 279 {
273 // Deleting your own items makes them go to trash 280 XmlDocument doc = new XmlDocument();
274 // 281 SceneObjectGroup g = objlist[i];
275 282 doc.LoadXml(xmlStrings[g.UUID]);
276 InventoryFolderBase folder = null; 283 XmlElement e = (XmlElement)doc.SelectSingleNode("/SceneObjectGroup");
277 InventoryItemBase item = null; 284 e.SetAttribute("offsetx", offsets[i].X.ToString());
285 e.SetAttribute("offsety", offsets[i].Y.ToString());
286 e.SetAttribute("offsetz", offsets[i].Z.ToString());
287
288 XmlNode objectNode = itemDoc.ImportNode(e, true);
289 root.AppendChild(objectNode);
290 }
278 291
279 if (DeRezAction.SaveToExistingUserInventoryItem == action) 292 float sizeX = maxX - minX;
280 { 293 float sizeY = maxY - minY;
281 item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID, userID); 294 float sizeZ = maxZ - minZ;
282 item = m_Scene.InventoryService.GetItem(item);
283 295
284 //item = userInfo.RootFolder.FindItem( 296 root.SetAttribute("x", sizeX.ToString());
285 // objectGroup.RootPart.FromUserInventoryItemID); 297 root.SetAttribute("y", sizeY.ToString());
298 root.SetAttribute("z", sizeZ.ToString());
286 299
287 if (null == item) 300 itemXml = itemDoc.InnerXml;
301 }
302 else
288 { 303 {
289 m_log.DebugFormat( 304 itemXml = xmlStrings[objlist[0].UUID];
290 "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
291 objectGroup.Name, objectGroup.UUID);
292 return UUID.Zero;
293 } 305 }
294 } 306
295 else 307 // Get the user info of the item destination
296 {
297 // Folder magic
298 // 308 //
299 if (action == DeRezAction.Delete) 309 UUID userID = UUID.Zero;
310
311 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
312 action == DeRezAction.SaveToExistingUserInventoryItem)
300 { 313 {
301 // Deleting someone else's item 314 // Take or take copy require a taker
315 // Saving changes requires a local user
302 // 316 //
303 if (remoteClient == null || 317 if (remoteClient == null)
304 objectGroup.OwnerID != remoteClient.AgentId) 318 return UUID.Zero;
305 {
306 319
307 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); 320 userID = remoteClient.AgentId;
308 }
309 else
310 {
311 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
312 }
313 } 321 }
314 else if (action == DeRezAction.Return) 322 else
315 { 323 {
316 324 // All returns / deletes go to the object owner
317 // Dump to lost + found unconditionally
318 // 325 //
319 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); 326
327 userID = objlist[0].RootPart.OwnerID;
320 } 328 }
321 329
322 if (folderID == UUID.Zero && folder == null) 330 if (userID == UUID.Zero) // Can't proceed
323 { 331 {
324 if (action == DeRezAction.Delete) 332 return UUID.Zero;
333 }
334
335 // If we're returning someone's item, it goes back to the
336 // owner's Lost And Found folder.
337 // Delete is treated like return in this case
338 // Deleting your own items makes them go to trash
339 //
340
341 InventoryFolderBase folder = null;
342 InventoryItemBase item = null;
343
344 if (DeRezAction.SaveToExistingUserInventoryItem == action)
345 {
346 item = new InventoryItemBase(objlist[0].RootPart.FromUserInventoryItemID, userID);
347 item = m_Scene.InventoryService.GetItem(item);
348
349 //item = userInfo.RootFolder.FindItem(
350 // objectGroup.RootPart.FromUserInventoryItemID);
351
352 if (null == item)
325 { 353 {
326 // Deletes go to trash by default 354 m_log.DebugFormat(
327 // 355 "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
328 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder); 356 objlist[0].Name, objlist[0].UUID);
357 return UUID.Zero;
329 } 358 }
330 else 359 }
360 else
361 {
362 // Folder magic
363 //
364 if (action == DeRezAction.Delete)
331 { 365 {
366 // Deleting someone else's item
367 //
332 if (remoteClient == null || 368 if (remoteClient == null ||
333 objectGroup.OwnerID != remoteClient.AgentId) 369 objlist[0].OwnerID != remoteClient.AgentId)
334 { 370 {
335 // Taking copy of another person's item. Take to 371
336 // Objects folder. 372 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
337 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
338 } 373 }
339 else 374 else
340 { 375 {
341 // Catch all. Use lost & found 376 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
377 }
378 }
379 else if (action == DeRezAction.Return)
380 {
381
382 // Dump to lost + found unconditionally
383 //
384 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
385 }
386
387 if (folderID == UUID.Zero && folder == null)
388 {
389 if (action == DeRezAction.Delete)
390 {
391 // Deletes go to trash by default
342 // 392 //
393 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
394 }
395 else
396 {
397 if (remoteClient == null ||
398 objlist[0].OwnerID != remoteClient.AgentId)
399 {
400 // Taking copy of another person's item. Take to
401 // Objects folder.
402 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
403 }
404 else
405 {
406 // Catch all. Use lost & found
407 //
343 408
344 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); 409 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
410 }
345 } 411 }
346 } 412 }
347 }
348 413
349 // Override and put into where it came from, if it came 414 // Override and put into where it came from, if it came
350 // from anywhere in inventory 415 // from anywhere in inventory
351 // 416 //
352 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy) 417 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
353 {
354 if (objectGroup.RootPart.FromFolderID != UUID.Zero)
355 { 418 {
356 InventoryFolderBase f = new InventoryFolderBase(objectGroup.RootPart.FromFolderID, userID); 419 if (objlist[0].RootPart.FromFolderID != UUID.Zero)
357 folder = m_Scene.InventoryService.GetFolder(f); 420 {
421 InventoryFolderBase f = new InventoryFolderBase(objlist[0].RootPart.FromFolderID, userID);
422 folder = m_Scene.InventoryService.GetFolder(f);
423 }
358 } 424 }
359 }
360 425
361 if (folder == null) // None of the above 426 if (folder == null) // None of the above
362 { 427 {
363 folder = new InventoryFolderBase(folderID); 428 folder = new InventoryFolderBase(folderID);
364 429
365 if (folder == null) // Nowhere to put it 430 if (folder == null) // Nowhere to put it
431 {
432 return UUID.Zero;
433 }
434 }
435
436 item = new InventoryItemBase();
437 // Can't know creator is the same, so null it in inventory
438 if (objlist.Count > 1)
439 item.CreatorId = UUID.Zero.ToString();
440 else
441 item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
442 item.ID = UUID.Random();
443 item.InvType = (int)InventoryType.Object;
444 item.Folder = folder.ID;
445 item.Owner = userID;
446 if (objlist.Count > 1)
366 { 447 {
367 return UUID.Zero; 448 item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
449 }
450 else
451 {
452 item.SaleType = objlist[0].RootPart.ObjectSaleType;
453 item.SalePrice = objlist[0].RootPart.SalePrice;
368 } 454 }
369 } 455 }
370 456
371 item = new InventoryItemBase(); 457 AssetBase asset = CreateAsset(
372 item.CreatorId = objectGroup.RootPart.CreatorID.ToString(); 458 objlist[0].GetPartName(objlist[0].RootPart.LocalId),
373 item.CreatorData = objectGroup.RootPart.CreatorData; 459 objlist[0].GetPartDescription(objlist[0].RootPart.LocalId),
374 item.ID = UUID.Random(); 460 (sbyte)AssetType.Object,
375 item.InvType = (int)InventoryType.Object; 461 Utils.StringToBytes(itemXml),
376 item.Folder = folder.ID; 462 objlist[0].OwnerID.ToString());
377 item.Owner = userID; 463 m_Scene.AssetService.Store(asset);
378 } 464 assetID = asset.FullID;
379
380 AssetBase asset = CreateAsset(
381 objectGroup.GetPartName(objectGroup.RootPart.LocalId),
382 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
383 (sbyte)AssetType.Object,
384 Utils.StringToBytes(sceneObjectXml),
385 objectGroup.OwnerID.ToString());
386 m_Scene.AssetService.Store(asset);
387 assetID = asset.FullID;
388
389 if (DeRezAction.SaveToExistingUserInventoryItem == action)
390 {
391 item.AssetID = asset.FullID;
392 m_Scene.InventoryService.UpdateItem(item);
393 }
394 else
395 {
396 item.AssetID = asset.FullID;
397 465
398 if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions()) 466 if (DeRezAction.SaveToExistingUserInventoryItem == action)
399 { 467 {
400 uint perms = objectGroup.GetEffectivePermissions(); 468 item.AssetID = asset.FullID;
401 uint nextPerms = (perms & 7) << 13; 469 m_Scene.InventoryService.UpdateItem(item);
402 if ((nextPerms & (uint)PermissionMask.Copy) == 0)
403 perms &= ~(uint)PermissionMask.Copy;
404 if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
405 perms &= ~(uint)PermissionMask.Transfer;
406 if ((nextPerms & (uint)PermissionMask.Modify) == 0)
407 perms &= ~(uint)PermissionMask.Modify;
408
409 // Make sure all bits but the ones we want are clear
410 // on take.
411 // This will be applied to the current perms, so
412 // it will do what we want.
413 objectGroup.RootPart.NextOwnerMask &=
414 ((uint)PermissionMask.Copy |
415 (uint)PermissionMask.Transfer |
416 (uint)PermissionMask.Modify);
417 objectGroup.RootPart.NextOwnerMask |=
418 (uint)PermissionMask.Move;
419
420 item.BasePermissions = perms & objectGroup.RootPart.NextOwnerMask;
421 item.CurrentPermissions = item.BasePermissions;
422 item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
423 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
424 item.GroupPermissions = objectGroup.RootPart.GroupMask & objectGroup.RootPart.NextOwnerMask;
425
426 // Magic number badness. Maybe this deserves an enum.
427 // bit 4 (16) is the "Slam" bit, it means treat as passed
428 // and apply next owner perms on rez
429 item.CurrentPermissions |= 16; // Slam!
430 } 470 }
431 else 471 else
432 { 472 {
433 item.BasePermissions = objectGroup.GetEffectivePermissions(); 473 item.AssetID = asset.FullID;
434 item.CurrentPermissions = objectGroup.GetEffectivePermissions();
435 item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
436 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
437 item.GroupPermissions = objectGroup.RootPart.GroupMask;
438 474
439 item.CurrentPermissions &= 475 uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
440 ((uint)PermissionMask.Copy | 476 foreach (SceneObjectGroup grp in objlist)
441 (uint)PermissionMask.Transfer | 477 effectivePerms &= grp.GetEffectivePermissions();
442 (uint)PermissionMask.Modify | 478 effectivePerms |= (uint)PermissionMask.Move;
443 (uint)PermissionMask.Move | 479
444 7); // Preserve folded permissions 480 if (remoteClient != null && (remoteClient.AgentId != objlist[0].RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
445 } 481 {
482 uint perms = effectivePerms;
483 uint nextPerms = (perms & 7) << 13;
484 if ((nextPerms & (uint)PermissionMask.Copy) == 0)
485 perms &= ~(uint)PermissionMask.Copy;
486 if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
487 perms &= ~(uint)PermissionMask.Transfer;
488 if ((nextPerms & (uint)PermissionMask.Modify) == 0)
489 perms &= ~(uint)PermissionMask.Modify;
490
491 item.BasePermissions = perms & objlist[0].RootPart.NextOwnerMask;
492 item.CurrentPermissions = item.BasePermissions;
493 item.NextPermissions = perms & objlist[0].RootPart.NextOwnerMask;
494 item.EveryOnePermissions = objlist[0].RootPart.EveryoneMask & objlist[0].RootPart.NextOwnerMask;
495 item.GroupPermissions = objlist[0].RootPart.GroupMask & objlist[0].RootPart.NextOwnerMask;
496
497 // Magic number badness. Maybe this deserves an enum.
498 // bit 4 (16) is the "Slam" bit, it means treat as passed
499 // and apply next owner perms on rez
500 item.CurrentPermissions |= 16; // Slam!
501 }
502 else
503 {
504 item.BasePermissions = effectivePerms;
505 item.CurrentPermissions = effectivePerms;
506 item.NextPermissions = objlist[0].RootPart.NextOwnerMask & effectivePerms;
507 item.EveryOnePermissions = objlist[0].RootPart.EveryoneMask & effectivePerms;
508 item.GroupPermissions = objlist[0].RootPart.GroupMask & effectivePerms;
509
510 item.CurrentPermissions &=
511 ((uint)PermissionMask.Copy |
512 (uint)PermissionMask.Transfer |
513 (uint)PermissionMask.Modify |
514 (uint)PermissionMask.Move |
515 7); // Preserve folded permissions
516 }
446 517
447 // TODO: add the new fields (Flags, Sale info, etc) 518 item.CreationDate = Util.UnixTimeSinceEpoch();
448 item.CreationDate = Util.UnixTimeSinceEpoch(); 519 item.Description = asset.Description;
449 item.Description = asset.Description; 520 item.Name = asset.Name;
450 item.Name = asset.Name; 521 item.AssetType = asset.Type;
451 item.AssetType = asset.Type;
452 522
453 m_Scene.AddInventoryItem(item); 523 m_Scene.AddInventoryItem(item);
454 524
455 if (remoteClient != null && item.Owner == remoteClient.AgentId) 525 if (remoteClient != null && item.Owner == remoteClient.AgentId)
456 {
457 remoteClient.SendInventoryItemCreateUpdate(item, 0);
458 }
459 else
460 {
461 ScenePresence notifyUser = m_Scene.GetScenePresence(item.Owner);
462 if (notifyUser != null)
463 { 526 {
464 notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0); 527 remoteClient.SendInventoryItemCreateUpdate(item, 0);
528 }
529 else
530 {
531 ScenePresence notifyUser = m_Scene.GetScenePresence(item.Owner);
532 if (notifyUser != null)
533 {
534 notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
535 }
465 } 536 }
466 } 537 }
467 } 538 }
468
469 return assetID; 539 return assetID;
470 } 540 }
471 541
@@ -516,8 +586,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
516 586
517 if (item != null) 587 if (item != null)
518 { 588 {
589 if (item.ID == UUID.Zero)
590 {
591 m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 1");
592 }
593
519 AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); 594 AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
520 595
596 SceneObjectGroup group = null;
597
521 if (rezAsset != null) 598 if (rezAsset != null)
522 { 599 {
523 UUID itemId = UUID.Zero; 600 UUID itemId = UUID.Zero;
@@ -526,32 +603,83 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
526 // item that it came from. This allows us to enable 'save object to inventory' 603 // item that it came from. This allows us to enable 'save object to inventory'
527 if (!m_Scene.Permissions.BypassPermissions()) 604 if (!m_Scene.Permissions.BypassPermissions())
528 { 605 {
529 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy) 606 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy && (item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
530 { 607 {
531 itemId = item.ID; 608 itemId = item.ID;
532 } 609 }
533 } 610 }
534 else 611 else
535 { 612 {
536 // Brave new fullperm world 613 if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
537 // 614 {
538 itemId = item.ID; 615 // Brave new fullperm world
616 itemId = item.ID;
617 }
618 }
619
620 if (item.ID == UUID.Zero)
621 {
622 m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 2");
539 } 623 }
540 624
541 string xmlData = Utils.BytesToString(rezAsset.Data); 625 string xmlData = Utils.BytesToString(rezAsset.Data);
542 SceneObjectGroup group 626 List<SceneObjectGroup> objlist =
543 = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData); 627 new List<SceneObjectGroup>();
628 List<Vector3> veclist = new List<Vector3>();
629
630 XmlDocument doc = new XmlDocument();
631 doc.LoadXml(xmlData);
632 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
633 if (e == null || attachment) // Single
634 {
635 SceneObjectGroup g =
636 SceneObjectSerializer.FromOriginalXmlFormat(
637 itemId, xmlData);
638 objlist.Add(g);
639 veclist.Add(new Vector3(0, 0, 0));
640
641 float offsetHeight = 0;
642 pos = m_Scene.GetNewRezLocation(
643 RayStart, RayEnd, RayTargetID, Quaternion.Identity,
644 BypassRayCast, bRayEndIsIntersection, true, g.GetAxisAlignedBoundingBox(out offsetHeight), false);
645 pos.Z += offsetHeight;
646 }
647 else
648 {
649 XmlElement coll = (XmlElement)e;
650 float bx = Convert.ToSingle(coll.GetAttribute("x"));
651 float by = Convert.ToSingle(coll.GetAttribute("y"));
652 float bz = Convert.ToSingle(coll.GetAttribute("z"));
653 Vector3 bbox = new Vector3(bx, by, bz);
544 654
545 group.RootPart.FromFolderID = item.Folder; 655 pos = m_Scene.GetNewRezLocation(RayStart, RayEnd,
656 RayTargetID, Quaternion.Identity,
657 BypassRayCast, bRayEndIsIntersection, true,
658 bbox, false);
546 659
547 // If it's rezzed in world, select it. Much easier to 660 pos -= bbox / 2;
548 // find small items. 661
549 // 662 XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
550 if (!attachment) 663 foreach (XmlNode n in groups)
551 group.RootPart.CreateSelected = true; 664 {
665 SceneObjectGroup g =
666 SceneObjectSerializer.FromOriginalXmlFormat(
667 itemId, n.OuterXml);
668 objlist.Add(g);
669 XmlElement el = (XmlElement)n;
670 float x = Convert.ToSingle(el.GetAttribute("offsetx"));
671 float y = Convert.ToSingle(el.GetAttribute("offsety"));
672 float z = Convert.ToSingle(el.GetAttribute("offsetz"));
673 veclist.Add(new Vector3(x, y, z));
674 }
675 }
676
677 int primcount = 0;
678 foreach (SceneObjectGroup g in objlist)
679 primcount += g.PrimCount;
552 680
553 if (!m_Scene.Permissions.CanRezObject( 681 if (!m_Scene.Permissions.CanRezObject(
554 group.PrimCount, remoteClient.AgentId, pos) 682 primcount, remoteClient.AgentId, pos)
555 && !attachment) 683 && !attachment)
556 { 684 {
557 // The client operates in no fail mode. It will 685 // The client operates in no fail mode. It will
@@ -564,116 +692,147 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
564 return null; 692 return null;
565 } 693 }
566 694
567 group.ResetIDs(); 695 for (int i = 0 ; i < objlist.Count ; i++ )
568
569 if (attachment)
570 {
571 group.RootPart.Flags |= PrimFlags.Phantom;
572 group.RootPart.IsAttachment = true;
573
574 // If we're rezzing an attachment then don't ask
575 // AddNewSceneObject() to update the client since
576 // we'll be doing that later on. Scheduling more
577 // than one full update during the attachment
578 // process causes some clients to fail to display
579 // the attachment properly.
580 // Also, don't persist attachments.
581 m_Scene.AddNewSceneObject(group, false, false);
582 }
583 else
584 { 696 {
585 m_Scene.AddNewSceneObject(group, true, false); 697 group = objlist[i];
586 }
587 698
588 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); 699 Vector3 storedPosition = group.AbsolutePosition;
589 // if attachment we set it's asset id so object updates can reflect that 700 if (group.UUID == UUID.Zero)
590 // if not, we set it's position in world. 701 {
591 if (!attachment) 702 m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 3");
592 { 703 }
593 group.ScheduleGroupForFullUpdate(); 704 group.RootPart.FromFolderID = item.Folder;
594
595 float offsetHeight = 0;
596 pos = m_Scene.GetNewRezLocation(
597 RayStart, RayEnd, RayTargetID, Quaternion.Identity,
598 BypassRayCast, bRayEndIsIntersection, true, group.GetAxisAlignedBoundingBox(out offsetHeight), false);
599 pos.Z += offsetHeight;
600 group.AbsolutePosition = pos;
601 // m_log.InfoFormat("rezx point for inventory rezz is {0} {1} {2} and offsetheight was {3}", pos.X, pos.Y, pos.Z, offsetHeight);
602 705
603 } 706 // If it's rezzed in world, select it. Much easier to
604 else 707 // find small items.
605 { 708 //
606 group.SetFromItemID(itemID); 709 if (!attachment)
607 } 710 {
711 group.RootPart.CreateSelected = true;
712 foreach (SceneObjectPart child in group.Parts)
713 child.CreateSelected = true;
714 }
608 715
609 SceneObjectPart rootPart = null; 716 group.ResetIDs();
610 try
611 {
612 rootPart = group.GetChildPart(group.UUID);
613 }
614 catch (NullReferenceException)
615 {
616 string isAttachment = "";
617 717
618 if (attachment) 718 if (attachment)
619 isAttachment = " Object was an attachment"; 719 {
720 group.RootPart.Flags |= PrimFlags.Phantom;
721 group.RootPart.IsAttachment = true;
722
723 // If we're rezzing an attachment then don't ask
724 // AddNewSceneObject() to update the client since
725 // we'll be doing that later on. Scheduling more
726 // than one full update during the attachment
727 // process causes some clients to fail to display
728 // the attachment properly.
729 // Also, don't persist attachments.
730 m_Scene.AddNewSceneObject(group, false, false);
731 }
732 else
733 {
734 m_Scene.AddNewSceneObject(group, true, false);
735 }
620 736
621 m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); 737 // if attachment we set it's asset id so object updates
622 } 738 // can reflect that, if not, we set it's position in world.
739 if (!attachment)
740 {
741 group.ScheduleGroupForFullUpdate();
742
743 group.AbsolutePosition = pos + veclist[i];
744 }
745 else
746 {
747 group.SetFromItemID(itemID);
748 }
623 749
624 // Since renaming the item in the inventory does not affect the name stored 750 SceneObjectPart rootPart = null;
625 // in the serialization, transfer the correct name from the inventory to the
626 // object itself before we rez.
627 rootPart.Name = item.Name;
628 rootPart.Description = item.Description;
629 751
630 group.SetGroup(remoteClient.ActiveGroupId, remoteClient); 752 try
631 if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) 753 {
632 { 754 rootPart = group.GetChildPart(group.UUID);
633 //Need to kill the for sale here 755 }
634 rootPart.ObjectSaleType = 0; 756 catch (NullReferenceException)
635 rootPart.SalePrice = 10; 757 {
758 string isAttachment = "";
636 759
637 if (m_Scene.Permissions.PropagatePermissions()) 760 if (attachment)
761 isAttachment = " Object was an attachment";
762
763 m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
764 }
765
766 // Since renaming the item in the inventory does not
767 // affect the name stored in the serialization, transfer
768 // the correct name from the inventory to the
769 // object itself before we rez.
770 // On coalesced objects, this has no effect.
771 if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
772 {
773 rootPart.Name = item.Name;
774 rootPart.Description = item.Description;
775 rootPart.ObjectSaleType = item.SaleType;
776 rootPart.SalePrice = item.SalePrice;
777 }
778
779 group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
780 if ((rootPart.OwnerID != item.Owner) ||
781 (item.CurrentPermissions & 16) != 0)
638 { 782 {
639 foreach (SceneObjectPart part in group.Parts) 783 //Need to kill the for sale here
784 rootPart.ObjectSaleType = 0;
785 rootPart.SalePrice = 10;
786
787 if (m_Scene.Permissions.PropagatePermissions())
640 { 788 {
641 part.EveryoneMask = item.EveryOnePermissions; 789 foreach (SceneObjectPart part in group.Parts)
642 part.NextOwnerMask = item.NextPermissions; 790 {
643 part.GroupMask = 0; // DO NOT propagate here 791 if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
792 {
793 part.EveryoneMask = item.EveryOnePermissions;
794 part.NextOwnerMask = item.NextPermissions;
795 }
796 part.GroupMask = 0; // DO NOT propagate here
797 }
798
799 group.ApplyNextOwnerPermissions();
644 } 800 }
645
646 group.ApplyNextOwnerPermissions();
647 } 801 }
648 }
649 802
650 foreach (SceneObjectPart part in group.Parts) 803 foreach (SceneObjectPart part in group.Parts)
651 {
652 if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
653 { 804 {
654 part.LastOwnerID = part.OwnerID; 805 if ((part.OwnerID != item.Owner) ||
655 part.OwnerID = item.Owner; 806 (item.CurrentPermissions & 16) != 0)
656 part.Inventory.ChangeInventoryOwner(item.Owner); 807 {
657 part.GroupMask = 0; // DO NOT propagate here 808 part.LastOwnerID = part.OwnerID;
809 part.OwnerID = item.Owner;
810 part.Inventory.ChangeInventoryOwner(item.Owner);
811 part.GroupMask = 0; // DO NOT propagate here
812 }
813 part.EveryoneMask = item.EveryOnePermissions;
814 part.NextOwnerMask = item.NextPermissions;
658 } 815 }
659 part.EveryoneMask = item.EveryOnePermissions;
660 part.NextOwnerMask = item.NextPermissions;
661 }
662 816
663 rootPart.TrimPermissions(); 817 rootPart.TrimPermissions();
664 818
665 if (!attachment) 819 if (!attachment)
666 {
667 if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
668 { 820 {
669 group.ClearPartAttachmentData(); 821 if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
670 } 822 {
671 823 // Save attachment data
672 // Fire on_rez 824 group.RootPart.AttachPoint = group.RootPart.Shape.State;
673 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1); 825 group.RootPart.AttachOffset = storedPosition;
674 rootPart.ParentGroup.ResumeScripts();
675 826
676 rootPart.ScheduleFullUpdate(); 827 group.ClearPartAttachmentData();
828 }
829
830 // Fire on_rez
831 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
832 rootPart.ParentGroup.ResumeScripts();
833
834 rootPart.ScheduleFullUpdate();
835 }
677 } 836 }
678 837
679 if (!m_Scene.Permissions.BypassPermissions()) 838 if (!m_Scene.Permissions.BypassPermissions())
@@ -691,9 +850,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
691 } 850 }
692 } 851 }
693 } 852 }
694
695 return rootPart.ParentGroup;
696 } 853 }
854 return group;
697 } 855 }
698 856
699 return null; 857 return null;
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 9b565ed..1fd1f47 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
142 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" }); 142 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
143 return urlcode; 143 return urlcode;
144 } 144 }
145 string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/"; 145 string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString();
146 146
147 UrlData urlData = new UrlData(); 147 UrlData urlData = new UrlData();
148 urlData.hostID = host.UUID; 148 urlData.hostID = host.UUID;
@@ -152,10 +152,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
152 urlData.urlcode = urlcode; 152 urlData.urlcode = urlcode;
153 urlData.requests = new Dictionary<UUID, RequestData>(); 153 urlData.requests = new Dictionary<UUID, RequestData>();
154 154
155
156 m_UrlMap[url] = urlData; 155 m_UrlMap[url] = urlData;
157 156
158 string uri = "/lslhttp/" + urlcode.ToString() + "/"; 157 string uri = "/lslhttp/" + urlcode.ToString();
159 158
160 m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll, 159 m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll,
161 new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents, 160 new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents,
@@ -386,6 +385,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
386 385
387 return response; 386 return response;
388 } 387 }
388
389 public void HttpRequestHandler(UUID requestID, Hashtable request) 389 public void HttpRequestHandler(UUID requestID, Hashtable request)
390 { 390 {
391 lock (request) 391 lock (request)
@@ -400,8 +400,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
400 400
401 int pos1 = uri.IndexOf("/");// /lslhttp 401 int pos1 = uri.IndexOf("/");// /lslhttp
402 int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/ 402 int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
403 int pos3 = uri.IndexOf("/", pos2 + 1);// /lslhttp/<UUID>/ 403 int pos3 = pos2 + 37; // /lslhttp/urlcode
404 string uri_tmp = uri.Substring(0, pos3 + 1); 404 string uri_tmp = uri.Substring(0, pos3);
405 //HTTP server code doesn't provide us with QueryStrings 405 //HTTP server code doesn't provide us with QueryStrings
406 string pathInfo; 406 string pathInfo;
407 string queryString; 407 string queryString;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index e54ee02..ebfba2b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -57,9 +57,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
57 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); 57 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
58 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService"); 58 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
59 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 59 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
60 config.Configs["GridService"].Set("Region_Test_Region_1", "DefaultRegion"); 60 config.Configs["GridService"].Set("Region_Test_Region_1", "DefaultRegion");
61 config.Configs["GridService"].Set("Region_Test_Region_2", "FallbackRegion"); 61 config.Configs["GridService"].Set("Region_Test_Region_2", "FallbackRegion");
62 config.Configs["GridService"].Set("Region_Test_Region_3", "FallbackRegion"); 62 config.Configs["GridService"].Set("Region_Test_Region_3", "FallbackRegion");
63 config.Configs["GridService"].Set("Region_Other_Region_4", "FallbackRegion"); 63 config.Configs["GridService"].Set("Region_Other_Region_4", "FallbackRegion");
64 64
65 m_LocalConnector = new LocalGridServicesConnector(config); 65 m_LocalConnector = new LocalGridServicesConnector(config);
@@ -128,8 +128,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
128 Assert.IsNotNull(result, "Retrieved GetRegionByName is null"); 128 Assert.IsNotNull(result, "Retrieved GetRegionByName is null");
129 Assert.That(result.RegionName, Is.EqualTo("Test Region 1"), "Retrieved region's name does not match"); 129 Assert.That(result.RegionName, Is.EqualTo("Test Region 1"), "Retrieved region's name does not match");
130 130
131 m_LocalConnector.RegisterRegion(UUID.Zero, r2); 131 m_LocalConnector.RegisterRegion(UUID.Zero, r2);
132 m_LocalConnector.RegisterRegion(UUID.Zero, r3); 132 m_LocalConnector.RegisterRegion(UUID.Zero, r3);
133 m_LocalConnector.RegisterRegion(UUID.Zero, r4); 133 m_LocalConnector.RegisterRegion(UUID.Zero, r4);
134 134
135 result = m_LocalConnector.GetRegionByUUID(UUID.Zero, new UUID(1)); 135 result = m_LocalConnector.GetRegionByUUID(UUID.Zero, new UUID(1));
@@ -154,38 +154,38 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
154 Assert.IsNotNull(results, "Retrieved GetRegionRange collection is null"); 154 Assert.IsNotNull(results, "Retrieved GetRegionRange collection is null");
155 Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected"); 155 Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected");
156 156
157 results = m_LocalConnector.GetDefaultRegions(UUID.Zero); 157 results = m_LocalConnector.GetDefaultRegions(UUID.Zero);
158 Assert.IsNotNull(results, "Retrieved GetDefaultRegions collection is null"); 158 Assert.IsNotNull(results, "Retrieved GetDefaultRegions collection is null");
159 Assert.That(results.Count, Is.EqualTo(1), "Retrieved default regions collection has not the expected size"); 159 Assert.That(results.Count, Is.EqualTo(1), "Retrieved default regions collection has not the expected size");
160 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(1)), "Retrieved default region's UUID does not match"); 160 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(1)), "Retrieved default region's UUID does not match");
161 161
162 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r1.RegionLocX, r1.RegionLocY); 162 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r1.RegionLocX, r1.RegionLocY);
163 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 1 is null"); 163 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 1 is null");
164 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 1 has not the expected size"); 164 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 1 has not the expected size");
165 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions for default region are not in the expected order 2-4-3"); 165 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");
166 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions for default region are not in the expected order 2-4-3"); 166 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");
167 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions for default region are not in the expected order 2-4-3"); 167 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");
168 168
169 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r2.RegionLocX, r2.RegionLocY); 169 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r2.RegionLocX, r2.RegionLocY);
170 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 2 is null"); 170 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 2 is null");
171 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 2 has not the expected size"); 171 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 2 has not the expected size");
172 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 2-4-3"); 172 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 2-4-3");
173 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 2-4-3"); 173 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 2-4-3");
174 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 2-4-3"); 174 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 2-4-3");
175 175
176 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r3.RegionLocX, r3.RegionLocY); 176 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r3.RegionLocX, r3.RegionLocY);
177 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 3 is null"); 177 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 3 is null");
178 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 3 has not the expected size"); 178 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 3 has not the expected size");
179 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 3-4-2"); 179 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 3-4-2");
180 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 3-4-2"); 180 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 3-4-2");
181 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 3-4-2"); 181 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 3-4-2");
182 182
183 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r4.RegionLocX, r4.RegionLocY); 183 results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r4.RegionLocX, r4.RegionLocY);
184 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 4 is null"); 184 Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 4 is null");
185 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 4 has not the expected size"); 185 Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 4 has not the expected size");
186 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 4-3-2"); 186 Assert.That(results[0].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 4-3-2");
187 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 4-3-2"); 187 Assert.That(results[1].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 4-3-2");
188 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 4-3-2"); 188 Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 4-3-2");
189 189
190 results = m_LocalConnector.GetHyperlinks(UUID.Zero); 190 results = m_LocalConnector.GetHyperlinks(UUID.Zero);
191 Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null"); 191 Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index e32dbb3..329a259 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -290,6 +290,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
290 return false; 290 return false;
291 } 291 }
292 292
293 public bool CloseChildAgent(GridRegion destination, UUID id)
294 {
295 if (destination == null)
296 return false;
297
298 foreach (Scene s in m_sceneList)
299 {
300 if (s.RegionInfo.RegionID == destination.RegionID)
301 {
302 //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
303 return s.IncomingCloseChildAgent(id);
304 }
305 }
306 //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
307 return false;
308 }
309
293 /** 310 /**
294 * Object-related communications 311 * Object-related communications
295 */ 312 */
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 3f577f2..e16e273 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -252,6 +252,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
252 return false; 252 return false;
253 } 253 }
254 254
255 public bool CloseChildAgent(GridRegion destination, UUID id)
256 {
257 if (destination == null)
258 return false;
259
260 // Try local first
261 if (m_localBackend.CloseChildAgent(destination, id))
262 return true;
263
264 // else do the remote thing
265 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
266 return m_remoteConnector.CloseChildAgent(destination, id);
267
268 return false;
269 }
255 270
256 public bool CloseAgent(GridRegion destination, UUID id) 271 public bool CloseAgent(GridRegion destination, UUID id)
257 { 272 {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 3238a81..d948b82 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -287,6 +287,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver
287 // being no copy/no mod for everyone 287 // being no copy/no mod for everyone
288 lock (part.TaskInventory) 288 lock (part.TaskInventory)
289 { 289 {
290 if (!ResolveUserUuid(part.CreatorID))
291 part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
292
293 if (!ResolveUserUuid(part.OwnerID))
294 part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
295
296 if (!ResolveUserUuid(part.LastOwnerID))
297 part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
298
299 // And zap any troublesome sit target information
300 part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
301 part.SitTargetPosition = new Vector3(0, 0, 0);
302
303 // Fix ownership/creator of inventory items
304 // Not doing so results in inventory items
305 // being no copy/no mod for everyone
306 part.TaskInventory.LockItemsForRead(true);
290 TaskInventoryDictionary inv = part.TaskInventory; 307 TaskInventoryDictionary inv = part.TaskInventory;
291 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) 308 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
292 { 309 {
@@ -302,6 +319,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
302 if (UserManager != null) 319 if (UserManager != null)
303 UserManager.AddUser(kvp.Value.CreatorID, kvp.Value.CreatorData); 320 UserManager.AddUser(kvp.Value.CreatorID, kvp.Value.CreatorData);
304 } 321 }
322 part.TaskInventory.LockItemsForRead(false);
305 } 323 }
306 } 324 }
307 325
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 622fc08..14de4f4 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using System.Security; 31using System.Security;
32using System.Timers;
32using log4net; 33using log4net;
33using Nini.Config; 34using Nini.Config;
34using OpenMetaverse; 35using OpenMetaverse;
@@ -45,6 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
45 private delegate void LookupUUIDS(List<UUID> uuidLst); 46 private delegate void LookupUUIDS(List<UUID> uuidLst);
46 47
47 private Scene m_scene; 48 private Scene m_scene;
49 private Timer m_regionChangeTimer = new Timer();
48 50
49 private EstateTerrainXferHandler TerrainUploader; 51 private EstateTerrainXferHandler TerrainUploader;
50 52
@@ -250,7 +252,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
250 252
251 if ((estateAccessType & 4) != 0) // User add 253 if ((estateAccessType & 4) != 0) // User add
252 { 254 {
253 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 255 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
254 { 256 {
255 m_scene.RegionInfo.EstateSettings.AddEstateUser(user); 257 m_scene.RegionInfo.EstateSettings.AddEstateUser(user);
256 m_scene.RegionInfo.EstateSettings.Save(); 258 m_scene.RegionInfo.EstateSettings.Save();
@@ -265,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
265 } 267 }
266 if ((estateAccessType & 8) != 0) // User remove 268 if ((estateAccessType & 8) != 0) // User remove
267 { 269 {
268 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 270 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
269 { 271 {
270 m_scene.RegionInfo.EstateSettings.RemoveEstateUser(user); 272 m_scene.RegionInfo.EstateSettings.RemoveEstateUser(user);
271 m_scene.RegionInfo.EstateSettings.Save(); 273 m_scene.RegionInfo.EstateSettings.Save();
@@ -280,7 +282,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
280 } 282 }
281 if ((estateAccessType & 16) != 0) // Group add 283 if ((estateAccessType & 16) != 0) // Group add
282 { 284 {
283 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 285 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
284 { 286 {
285 m_scene.RegionInfo.EstateSettings.AddEstateGroup(user); 287 m_scene.RegionInfo.EstateSettings.AddEstateGroup(user);
286 m_scene.RegionInfo.EstateSettings.Save(); 288 m_scene.RegionInfo.EstateSettings.Save();
@@ -294,7 +296,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
294 } 296 }
295 if ((estateAccessType & 32) != 0) // Group remove 297 if ((estateAccessType & 32) != 0) // Group remove
296 { 298 {
297 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions()) 299 if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
298 { 300 {
299 m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user); 301 m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user);
300 m_scene.RegionInfo.EstateSettings.Save(); 302 m_scene.RegionInfo.EstateSettings.Save();
@@ -343,7 +345,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
343 { 345 {
344 if (!s.IsChildAgent) 346 if (!s.IsChildAgent)
345 { 347 {
346 m_scene.TeleportClientHome(user, s.ControllingClient); 348 if (!m_scene.TeleportClientHome(user, s.ControllingClient))
349 {
350 s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
351 s.ControllingClient.Close();
352 }
347 } 353 }
348 } 354 }
349 355
@@ -477,7 +483,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
477 ScenePresence s = m_scene.GetScenePresence(prey); 483 ScenePresence s = m_scene.GetScenePresence(prey);
478 if (s != null) 484 if (s != null)
479 { 485 {
480 m_scene.TeleportClientHome(prey, s.ControllingClient); 486 if (!m_scene.TeleportClientHome(prey, s.ControllingClient))
487 {
488 s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
489 s.ControllingClient.Close();
490 }
481 } 491 }
482 } 492 }
483 } 493 }
@@ -496,7 +506,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
496 // Also make sure they are actually in the region 506 // Also make sure they are actually in the region
497 if (p != null && !p.IsChildAgent) 507 if (p != null && !p.IsChildAgent)
498 { 508 {
499 m_scene.TeleportClientHome(p.UUID, p.ControllingClient); 509 if (!m_scene.TeleportClientHome(p.UUID, p.ControllingClient))
510 {
511 p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
512 p.ControllingClient.Close();
513 }
500 } 514 }
501 } 515 }
502 }); 516 });
@@ -905,6 +919,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
905 m_scene.RegisterModuleInterface<IEstateModule>(this); 919 m_scene.RegisterModuleInterface<IEstateModule>(this);
906 m_scene.EventManager.OnNewClient += EventManager_OnNewClient; 920 m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
907 m_scene.EventManager.OnRequestChangeWaterHeight += changeWaterHeight; 921 m_scene.EventManager.OnRequestChangeWaterHeight += changeWaterHeight;
922 m_regionChangeTimer.AutoReset = false;
923 m_regionChangeTimer.Interval = 2000;
924 m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
908 925
909 m_scene.AddCommand(this, "set terrain texture", 926 m_scene.AddCommand(this, "set terrain texture",
910 "set terrain texture <number> <uuid> [<x>] [<y>]", 927 "set terrain texture <number> <uuid> [<x>] [<y>]",
@@ -1177,6 +1194,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
1177 1194
1178 protected void TriggerRegionInfoChange() 1195 protected void TriggerRegionInfoChange()
1179 { 1196 {
1197 m_regionChangeTimer.Stop();
1198 m_regionChangeTimer.Start();
1199 }
1200
1201 protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
1202 {
1180 ChangeDelegate change = OnRegionInfoChange; 1203 ChangeDelegate change = OnRegionInfoChange;
1181 1204
1182 if (change != null) 1205 if (change != null)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 695202f..9779c68 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -85,6 +85,8 @@ namespace OpenSim.Region.CoreModules.World.Land
85 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1; 85 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
86 86
87 private bool m_allowedForcefulBans = true; 87 private bool m_allowedForcefulBans = true;
88 private UUID DefaultGodParcelGroup;
89 private string DefaultGodParcelName;
88 90
89 // caches ExtendedLandData 91 // caches ExtendedLandData
90 private Cache parcelInfoCache; 92 private Cache parcelInfoCache;
@@ -100,6 +102,12 @@ namespace OpenSim.Region.CoreModules.World.Land
100 102
101 public void Initialise(IConfigSource source) 103 public void Initialise(IConfigSource source)
102 { 104 {
105 IConfig cnf = source.Configs["LandManagement"];
106 if (cnf != null)
107 {
108 DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
109 DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
110 }
103 } 111 }
104 112
105 public void AddRegion(Scene scene) 113 public void AddRegion(Scene scene)
@@ -351,7 +359,7 @@ namespace OpenSim.Region.CoreModules.World.Land
351 { 359 {
352 if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) 360 if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
353 { 361 {
354 if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) 362 if (parcelAvatarIsEntering.IsEitherBannedOrRestricted(avatar.UUID))
355 { 363 {
356 SendYouAreBannedNotice(avatar); 364 SendYouAreBannedNotice(avatar);
357 ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar)); 365 ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
@@ -648,7 +656,7 @@ namespace OpenSim.Region.CoreModules.World.Land
648 int x; 656 int x;
649 int y; 657 int y;
650 658
651 if (x_float > Constants.RegionSize || x_float <= 0 || y_float > Constants.RegionSize || y_float <= 0) 659 if (x_float > Constants.RegionSize || x_float < 0 || y_float > Constants.RegionSize || y_float < 0)
652 return null; 660 return null;
653 661
654 try 662 try
@@ -991,6 +999,10 @@ namespace OpenSim.Region.CoreModules.World.Land
991 //Owner Flag 999 //Owner Flag
992 tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); 1000 tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
993 } 1001 }
1002 else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
1003 {
1004 tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP);
1005 }
994 else if (currentParcelBlock.LandData.SalePrice > 0 && 1006 else if (currentParcelBlock.LandData.SalePrice > 0 &&
995 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || 1007 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
996 currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) 1008 currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
@@ -1285,7 +1297,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1285 { 1297 {
1286 land.DeedToGroup(groupID); 1298 land.DeedToGroup(groupID);
1287 } 1299 }
1288 1300 EventManagerOnParcelPrimCountTainted();
1289 } 1301 }
1290 1302
1291 1303
@@ -1293,18 +1305,31 @@ namespace OpenSim.Region.CoreModules.World.Land
1293 1305
1294 public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) 1306 public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
1295 { 1307 {
1296 for (int i = 0; i < data.Count; i++) 1308 lock (m_landList)
1297 { 1309 {
1298 IncomingLandObjectFromStorage(data[i]); 1310 //Remove all the land objects in the sim and then process our new data
1311 foreach (int n in m_landList.Keys)
1312 {
1313 m_scene.EventManager.TriggerLandObjectRemoved(m_landList[n].LandData.GlobalID);
1314 }
1315 m_landIDList.Initialize();
1316 m_landList.Clear();
1317
1318 for (int i = 0; i < data.Count; i++)
1319 {
1320 IncomingLandObjectFromStorage(data[i]);
1321 }
1299 } 1322 }
1300 } 1323 }
1301 1324
1302 public void IncomingLandObjectFromStorage(LandData data) 1325 public void IncomingLandObjectFromStorage(LandData data)
1303 { 1326 {
1327
1304 ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene); 1328 ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
1305 new_land.LandData = data.Copy(); 1329 new_land.LandData = data.Copy();
1306 new_land.SetLandBitmapFromByteArray(); 1330 new_land.SetLandBitmapFromByteArray();
1307 AddLandObject(new_land); 1331 AddLandObject(new_land);
1332 new_land.SendLandUpdateToAvatarsOverMe();
1308 } 1333 }
1309 1334
1310 public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) 1335 public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
@@ -1577,5 +1602,321 @@ namespace OpenSim.Region.CoreModules.World.Land
1577 1602
1578 UpdateLandObject(localID, land.LandData); 1603 UpdateLandObject(localID, land.LandData);
1579 } 1604 }
1605
1606 public void ClientOnParcelGodMark(IClientAPI client, UUID god, int landID)
1607 {
1608 ILandObject land = null;
1609 List<ILandObject> Land = ((Scene)client.Scene).LandChannel.AllParcels();
1610 foreach (ILandObject landObject in Land)
1611 {
1612 if (landObject.LandData.LocalID == landID)
1613 {
1614 land = landObject;
1615 }
1616 }
1617 land.DeedToGroup(DefaultGodParcelGroup);
1618 land.LandData.Name = DefaultGodParcelName;
1619 land.SendLandUpdateToAvatarsOverMe();
1620 }
1621
1622 private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID)
1623 {
1624 ScenePresence SP;
1625 ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP);
1626 List<SceneObjectGroup> returns = new List<SceneObjectGroup>();
1627 if (SP.GodLevel != 0)
1628 {
1629 if (flags == 0) //All parcels, scripted or not
1630 {
1631 ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
1632 {
1633 if (e.OwnerID == targetID)
1634 {
1635 returns.Add(e);
1636 }
1637 }
1638 );
1639 }
1640 if (flags == 4) //All parcels, scripted object
1641 {
1642 ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
1643 {
1644 if (e.OwnerID == targetID)
1645 {
1646 if (e.scriptScore >= 0.01)
1647 {
1648 returns.Add(e);
1649 }
1650 }
1651 }
1652 );
1653 }
1654 if (flags == 4) //not target parcel, scripted object
1655 {
1656 ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
1657 {
1658 if (e.OwnerID == targetID)
1659 {
1660 ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
1661 if (landobject.LandData.OwnerID != e.OwnerID)
1662 {
1663 if (e.scriptScore >= 0.01)
1664 {
1665 returns.Add(e);
1666 }
1667 }
1668 }
1669 }
1670 );
1671 }
1672 foreach (SceneObjectGroup ol in returns)
1673 {
1674 ReturnObject(ol, client);
1675 }
1676 }
1677 }
1678 public void ReturnObject(SceneObjectGroup obj, IClientAPI client)
1679 {
1680 SceneObjectGroup[] objs = new SceneObjectGroup[1];
1681 objs[0] = obj;
1682 ((Scene)client.Scene).returnObjects(objs, client.AgentId);
1683 }
1684
1685 Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
1686
1687 public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
1688 {
1689 ScenePresence targetAvatar = null;
1690 ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
1691 ScenePresence parcelManager = null;
1692 ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
1693 System.Threading.Timer Timer;
1694
1695 if (targetAvatar.GodLevel == 0)
1696 {
1697 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
1698 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
1699 return;
1700 if (flags == 0)
1701 {
1702 targetAvatar.AllowMovement = false;
1703 targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds. You cannot move or interact with the world.");
1704 parcelManager.ControllingClient.SendAlertMessage("Avatar Frozen.");
1705 System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
1706 Timer = new System.Threading.Timer(timeCB, targetAvatar, 30000, 0);
1707 Timers.Add(targetAvatar.UUID, Timer);
1708 }
1709 else
1710 {
1711 targetAvatar.AllowMovement = true;
1712 targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has unfrozen you.");
1713 parcelManager.ControllingClient.SendAlertMessage("Avatar Unfrozen.");
1714 Timers.TryGetValue(targetAvatar.UUID, out Timer);
1715 Timers.Remove(targetAvatar.UUID);
1716 Timer.Dispose();
1717 }
1718 }
1719 }
1720 private void OnEndParcelFrozen(object avatar)
1721 {
1722 ScenePresence targetAvatar = (ScenePresence)avatar;
1723 targetAvatar.AllowMovement = true;
1724 System.Threading.Timer Timer;
1725 Timers.TryGetValue(targetAvatar.UUID, out Timer);
1726 Timers.Remove(targetAvatar.UUID);
1727 targetAvatar.ControllingClient.SendAgentAlertMessage("The freeze has worn off; you may go about your business.", false);
1728 }
1729
1730
1731 public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
1732 {
1733 ScenePresence targetAvatar = null;
1734 ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
1735 ScenePresence parcelManager = null;
1736 ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
1737 //Just eject
1738 if (flags == 0)
1739 {
1740 if (targetAvatar.GodLevel == 0)
1741 {
1742 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
1743 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
1744 return;
1745
1746 Vector3 position = new Vector3(0, 0, 0);
1747 List<ILandObject> allParcels = new List<ILandObject>();
1748 allParcels = AllParcels();
1749 if (allParcels.Count != 1)
1750 {
1751 foreach (ILandObject parcel in allParcels)
1752 {
1753 if (parcel.LandData.GlobalID != land.LandData.GlobalID)
1754 {
1755 if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
1756 {
1757 for (int x = 1; x <= Constants.RegionSize; x += 2)
1758 {
1759 for (int y = 1; y <= Constants.RegionSize; y += 2)
1760 {
1761 if (parcel.ContainsPoint(x, y))
1762 {
1763 position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
1764 targetAvatar.TeleportWithMomentum(position);
1765 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1766 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1767 return;
1768 }
1769 }
1770 }
1771 }
1772 }
1773 }
1774 }
1775 Vector3 targetVector;
1776 if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
1777 {
1778 if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
1779 {
1780 targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1781 targetAvatar.TeleportWithMomentum(targetVector);
1782 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1783 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1784 return;
1785 }
1786 else
1787 {
1788 targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1789 targetAvatar.TeleportWithMomentum(targetVector);
1790 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1791 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1792 return;
1793 }
1794 }
1795 else
1796 {
1797 if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
1798 {
1799 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
1800 targetAvatar.TeleportWithMomentum(targetVector);
1801 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1802 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1803 return;
1804 }
1805 else
1806 {
1807 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
1808 targetAvatar.TeleportWithMomentum(targetVector);
1809 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1810 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1811 return;
1812 }
1813 }
1814 }
1815 }
1816 //Eject and ban
1817 if (flags == 1)
1818 {
1819 if (targetAvatar.GodLevel == 0)
1820 {
1821 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
1822 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
1823 return;
1824
1825 Vector3 position = new Vector3(0, 0, 0);
1826 List<ILandObject> allParcels = new List<ILandObject>();
1827 allParcels = AllParcels();
1828 if (allParcels.Count != 1)
1829 {
1830 foreach (ILandObject parcel in allParcels)
1831 {
1832 if (parcel.LandData.GlobalID != land.LandData.GlobalID)
1833 {
1834 if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
1835 {
1836 for (int x = 1; x <= Constants.RegionSize; x += 2)
1837 {
1838 for (int y = 1; y <= Constants.RegionSize; y += 2)
1839 {
1840 if (parcel.ContainsPoint(x, y))
1841 {
1842 position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
1843 targetAvatar.TeleportWithMomentum(position);
1844 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1845 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1846 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1847 entry.AgentID = targetAvatar.UUID;
1848 entry.Flags = AccessList.Ban;
1849 entry.Time = new DateTime();
1850 land.LandData.ParcelAccessList.Add(entry);
1851 return;
1852 }
1853 }
1854 }
1855 }
1856 }
1857 }
1858 }
1859 Vector3 targetVector;
1860 if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
1861 {
1862 if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
1863 {
1864 targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1865 targetAvatar.TeleportWithMomentum(targetVector);
1866 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1867 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1868 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1869 entry.AgentID = targetAvatar.UUID;
1870 entry.Flags = AccessList.Ban;
1871 entry.Time = new DateTime();
1872 land.LandData.ParcelAccessList.Add(entry);
1873 return;
1874 }
1875 else
1876 {
1877 targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1878 targetAvatar.TeleportWithMomentum(targetVector);
1879 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1880 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1881 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1882 entry.AgentID = targetAvatar.UUID;
1883 entry.Flags = AccessList.Ban;
1884 entry.Time = new DateTime();
1885 land.LandData.ParcelAccessList.Add(entry);
1886 return;
1887 }
1888 }
1889 else
1890 {
1891 if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
1892 {
1893 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
1894 targetAvatar.TeleportWithMomentum(targetVector);
1895 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1896 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1897 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1898 entry.AgentID = targetAvatar.UUID;
1899 entry.Flags = AccessList.Ban;
1900 entry.Time = new DateTime();
1901 land.LandData.ParcelAccessList.Add(entry);
1902 return;
1903 }
1904 else
1905 {
1906 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
1907 targetAvatar.TeleportWithMomentum(targetVector);
1908 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1909 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1910 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1911 entry.AgentID = targetAvatar.UUID;
1912 entry.Flags = AccessList.Ban;
1913 entry.Time = new DateTime();
1914 land.LandData.ParcelAccessList.Add(entry);
1915 return;
1916 }
1917 }
1918 }
1919 }
1920 }
1580 } 1921 }
1581} 1922}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index d87352f..d0517b7 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -288,6 +288,22 @@ namespace OpenSim.Region.CoreModules.World.Land
288 return false; 288 return false;
289 } 289 }
290 290
291 public bool HasGroupAccess(UUID avatar)
292 {
293 if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
294 {
295 ScenePresence sp;
296 if (!m_scene.TryGetScenePresence(avatar, out sp))
297 return false;
298
299 if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
300 return false;
301
302 return true;
303 }
304 return false;
305 }
306
291 public bool IsBannedFromLand(UUID avatar) 307 public bool IsBannedFromLand(UUID avatar)
292 { 308 {
293 if (m_scene.Permissions.IsAdministrator(avatar)) 309 if (m_scene.Permissions.IsAdministrator(avatar))
@@ -324,10 +340,14 @@ namespace OpenSim.Region.CoreModules.World.Land
324 //If they are not on the access list and are not the owner 340 //If they are not on the access list and are not the owner
325 if (!LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar) 341 if (!LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
326 { 342 {
327 //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel 343 if (!HasGroupAccess(avatar))
328 return true; 344 {
345 //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
346 return true;
347 }
329 } 348 }
330 } 349 }
350
331 return false; 351 return false;
332 } 352 }
333 353
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f5f3839..289741f 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
412 412
413 public string Name 413 public string Name
414 { 414 {
415 get { return "PermissionsModule"; } 415 get { return "DefaultPermissionsModule"; }
416 } 416 }
417 417
418 public bool IsSharedModule 418 public bool IsSharedModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 25d73c2..4611352 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -549,6 +549,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
549 m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised()); 549 m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
550 m_scene.SaveTerrain(); 550 m_scene.SaveTerrain();
551 551
552 m_scene.EventManager.TriggerTerrainUpdate();
553
552 // Clients who look at the map will never see changes after they looked at the map, so i've commented this out. 554 // Clients who look at the map will never see changes after they looked at the map, so i've commented this out.
553 //m_scene.CreateTerrainTexture(true); 555 //m_scene.CreateTerrainTexture(true);
554 } 556 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 9f88517..d2c3afb 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -86,9 +86,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
86 86
87 private void OnMapNameRequest(IClientAPI remoteClient, string mapName) 87 private void OnMapNameRequest(IClientAPI remoteClient, string mapName)
88 { 88 {
89 if (mapName.Length < 3) 89 if (mapName.Length < 2)
90 { 90 {
91 remoteClient.SendAlertMessage("Use a search string with at least 3 characters"); 91 remoteClient.SendAlertMessage("Use a search string with at least 2 characters");
92 return; 92 return;
93 } 93 }
94 94
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index e951bef..7a0ce51 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic;
28using OpenMetaverse; 29using OpenMetaverse;
29using OpenSim.Framework; 30using OpenSim.Framework;
30using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
@@ -110,7 +111,7 @@ namespace OpenSim.Region.Examples.SimpleModule
110 { 111 {
111 m_parts.Remove(part.UUID); 112 m_parts.Remove(part.UUID);
112 113
113 remoteClient.SendKillObject(m_regionHandle, part.LocalId); 114 remoteClient.SendKillObject(m_regionHandle, new List<uint>() { part.LocalId} );
114 remoteClient.AddMoney(1); 115 remoteClient.AddMoney(1);
115 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 116 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
116 } 117 }
@@ -121,7 +122,7 @@ namespace OpenSim.Region.Examples.SimpleModule
121 { 122 {
122 m_parts.Remove(m_rootPart.UUID); 123 m_parts.Remove(m_rootPart.UUID);
123 m_scene.DeleteSceneObject(this, false); 124 m_scene.DeleteSceneObject(this, false);
124 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); 125 remoteClient.SendKillObject(m_regionHandle, new List<uint>() { m_rootPart.LocalId });
125 remoteClient.AddMoney(50); 126 remoteClient.AddMoney(50);
126 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 127 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
127 } 128 }
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index f128aa2..7441a60 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Examples.SimpleModule
79 public event DisconnectUser OnDisconnectUser; 79 public event DisconnectUser OnDisconnectUser;
80 public event RequestAvatarProperties OnRequestAvatarProperties; 80 public event RequestAvatarProperties OnRequestAvatarProperties;
81 public event SetAlwaysRun OnSetAlwaysRun; 81 public event SetAlwaysRun OnSetAlwaysRun;
82 82 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
83 public event DeRezObject OnDeRezObject; 83 public event DeRezObject OnDeRezObject;
84 public event Action<IClientAPI> OnRegionHandShakeReply; 84 public event Action<IClientAPI> OnRegionHandShakeReply;
85 public event GenericCall1 OnRequestWearables; 85 public event GenericCall1 OnRequestWearables;
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Examples.SimpleModule
429 429
430 } 430 }
431 431
432 public virtual void SendKillObject(ulong regionHandle, uint localID) 432 public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
433 { 433 {
434 } 434 }
435 435
@@ -827,6 +827,11 @@ namespace OpenSim.Region.Examples.SimpleModule
827 827
828 public void Close() 828 public void Close()
829 { 829 {
830 Close(true);
831 }
832
833 public void Close(bool sendStop)
834 {
830 } 835 }
831 836
832 public void Start() 837 public void Start()
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index b3576c5..788f42b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
29using OpenMetaverse; 30using OpenMetaverse;
30using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
31using OpenSim.Framework; 32using OpenSim.Framework;
@@ -82,6 +83,10 @@ namespace OpenSim.Region.Framework.Interfaces
82 UUID RezSingleAttachmentFromInventory( 83 UUID RezSingleAttachmentFromInventory(
83 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); 84 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
84 85
86 // Same as above, but also load script states from a separate doc
87 UUID RezSingleAttachmentFromInventory(
88 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc);
89
85 /// <summary> 90 /// <summary>
86 /// Rez multiple attachments from a user's inventory 91 /// Rez multiple attachments from a user's inventory
87 /// </summary> 92 /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 64664ab..ed40da9 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -115,6 +115,8 @@ namespace OpenSim.Region.Framework.Interfaces
115 /// <param name="stateSource"></param> 115 /// <param name="stateSource"></param>
116 void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); 116 void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
117 117
118 ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
119
118 /// <summary> 120 /// <summary>
119 /// Stop a script which is in this prim's inventory. 121 /// Stop a script which is in this prim's inventory.
120 /// </summary> 122 /// </summary>
@@ -236,5 +238,6 @@ namespace OpenSim.Region.Framework.Interfaces
236 /// A <see cref="Dictionary`2"/> 238 /// A <see cref="Dictionary`2"/>
237 /// </returns> 239 /// </returns>
238 Dictionary<UUID, string> GetScriptStates(); 240 Dictionary<UUID, string> GetScriptStates();
241 Dictionary<UUID, string> GetScriptStates(bool oldIDs);
239 } 242 }
240} 243}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index e8738c4..45ca5c5 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces
40 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, 40 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
41 Vector3 lookAt, uint teleportFlags); 41 Vector3 lookAt, uint teleportFlags);
42 42
43 void TeleportHome(UUID id, IClientAPI client); 43 bool TeleportHome(UUID id, IClientAPI client);
44 44
45 void Cross(ScenePresence agent, bool isFlying); 45 void Cross(ScenePresence agent, bool isFlying);
46 46
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index 2d6287f..67a500f 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -68,6 +68,14 @@ namespace OpenSim.Region.Framework.Interfaces
68 bool SendReleaseAgent(ulong regionHandle, UUID id, string uri); 68 bool SendReleaseAgent(ulong regionHandle, UUID id, string uri);
69 69
70 /// <summary> 70 /// <summary>
71 /// Close chid agent.
72 /// </summary>
73 /// <param name="regionHandle"></param>
74 /// <param name="id"></param>
75 /// <returns></returns>
76 bool SendCloseChildAgent(ulong regionHandle, UUID id);
77
78 /// <summary>
71 /// Close agent. 79 /// Close agent.
72 /// </summary> 80 /// </summary>
73 /// <param name="regionHandle"></param> 81 /// <param name="regionHandle"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
new file mode 100644
index 0000000..e01f649
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
@@ -0,0 +1,27 @@
1///////////////////////////////////////////////////////////////////
2//
3// (c) Careminster LImited, Melanie Thielker and the Meta7 Team
4//
5// This file is not open source. All rights reserved
6// Mod 2
7
8using OpenSim.Region.Framework.Scenes;
9
10public interface ISnmpModule
11{
12 void Trap(int code, string Message, Scene scene);
13 void Critical(string Message, Scene scene);
14 void Warning(string Message, Scene scene);
15 void Major(string Message, Scene scene);
16 void ColdStart(int step , Scene scene);
17 void Shutdown(int step , Scene scene);
18 //
19 // Node Start/stop events
20 //
21 void LinkUp(Scene scene);
22 void LinkDown(Scene scene);
23 void BootInfo(string data, Scene scene);
24 void trapDebug(string Module,string data, Scene scene);
25 void trapXMRE(int data, string Message, Scene scene);
26
27}
diff --git a/OpenSim/Region/Framework/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index 23be9c2..69ba2042 100644
--- a/OpenSim/Region/Framework/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -226,7 +226,8 @@ namespace OpenSim.Region.Framework
226 "[MODULES]: Could not load types for [{0}]. Exception {1}", pluginAssembly.FullName, e); 226 "[MODULES]: Could not load types for [{0}]. Exception {1}", pluginAssembly.FullName, e);
227 227
228 // justincc: Right now this is fatal to really get the user's attention 228 // justincc: Right now this is fatal to really get the user's attention
229 throw e; 229 // TomMeta: WTF? No, how about we /don't/ throw a fatal exception when there's no need to?
230 //throw e;
230 } 231 }
231 } 232 }
232 233
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index a90e0f3..9c103cb 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -53,11 +53,17 @@ namespace OpenSim.Region.Framework.Scenes.Animation
53 { 53 {
54 get { return m_movementAnimation; } 54 get { return m_movementAnimation; }
55 } 55 }
56 protected string m_movementAnimation = "DEFAULT"; 56 // protected string m_movementAnimation = "DEFAULT"; //KF: 'DEFAULT' does not exist!
57 57 protected string m_movementAnimation = "CROUCH"; //KF: CROUCH ensures reliable Av Anim. init.
58 private int m_animTickFall; 58 private int m_animTickFall;
59 private int m_animTickJump; 59// private int m_animTickJump;
60 60 public int m_animTickJump; // ScenePresence has to see this to control +Z force
61 public bool m_jumping = false; // Add for jumping
62 public float m_jumpVelocity = 0f; // Add for jumping
63 private int m_landing = 0; // Add for jumping
64 public bool m_falling = false; // Add for falling
65 private float m_fallHeight; // Add for falling
66
61 /// <value> 67 /// <value>
62 /// The scene presence that this animator applies to 68 /// The scene presence that this animator applies to
63 /// </value> 69 /// </value>
@@ -114,7 +120,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
114 120
115 public void ResetAnimations() 121 public void ResetAnimations()
116 { 122 {
123Console.WriteLine("ResetA.............");
117 m_animations.Clear(); 124 m_animations.Clear();
125TrySetMovementAnimation("STAND");
118 } 126 }
119 127
120 /// <summary> 128 /// <summary>
@@ -123,8 +131,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
123 /// </summary> 131 /// </summary>
124 public void TrySetMovementAnimation(string anim) 132 public void TrySetMovementAnimation(string anim)
125 { 133 {
126 //m_log.DebugFormat("Updating movement animation to {0}", anim);
127
128 if (!m_scenePresence.IsChildAgent) 134 if (!m_scenePresence.IsChildAgent)
129 { 135 {
130 if (m_animations.TrySetDefaultAnimation( 136 if (m_animations.TrySetDefaultAnimation(
@@ -142,14 +148,14 @@ namespace OpenSim.Region.Framework.Scenes.Animation
142 /// </summary> 148 /// </summary>
143 public string GetMovementAnimation() 149 public string GetMovementAnimation()
144 { 150 {
145 const float FALL_DELAY = 0.33f; 151//Console.WriteLine("GMA-------"); //##
146 const float PREJUMP_DELAY = 0.25f; 152//#@ const float FALL_DELAY = 0.33f;
147 153 const float FALL_DELAY = 800f; //## mS
154//rm for jumping const float PREJUMP_DELAY = 0.25f;
155 const float PREJUMP_DELAY = 200f; // mS add for jumping
156 const float JUMP_PERIOD = 800f; // mS add for jumping
148 #region Inputs 157 #region Inputs
149 if (m_scenePresence.SitGround) 158
150 {
151 return "SIT_GROUND_CONSTRAINED";
152 }
153 AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags; 159 AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags;
154 PhysicsActor actor = m_scenePresence.PhysicsActor; 160 PhysicsActor actor = m_scenePresence.PhysicsActor;
155 161
@@ -159,11 +165,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
159 Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix); 165 Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix);
160 166
161 // Check control flags 167 // Check control flags
162 bool heldForward = 168 bool heldForward = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS);
163 (((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) || ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS)); 169 bool heldBack = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG);
164 bool heldBack = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG; 170 bool heldLeft = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS);
165 bool heldLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS; 171 bool heldRight = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG);
166 bool heldRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG;
167 //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT; 172 //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT;
168 //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT; 173 //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
169 bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS; 174 bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS;
@@ -182,8 +187,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
182 187
183 // Is the avatar trying to move? 188 // Is the avatar trying to move?
184// bool moving = (move != Vector3.Zero); 189// bool moving = (move != Vector3.Zero);
185 bool jumping = m_animTickJump != 0; 190// rm for jumping bool jumping = m_animTickJump != 0;
186
187 #endregion Inputs 191 #endregion Inputs
188 192
189 #region Flying 193 #region Flying
@@ -192,6 +196,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
192 { 196 {
193 m_animTickFall = 0; 197 m_animTickFall = 0;
194 m_animTickJump = 0; 198 m_animTickJump = 0;
199 m_jumping = false; //add for jumping
200 m_falling = true; //add for falling
201 m_jumpVelocity = 0f; //add for jumping
202 actor.Selected = false; //add for jumping flag
203 m_fallHeight = actor.Position.Z; // save latest flying height
195 204
196 if (move.X != 0f || move.Y != 0f) 205 if (move.X != 0f || move.Y != 0f)
197 { 206 {
@@ -203,8 +212,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
203 } 212 }
204 else if (move.Z < 0f) 213 else if (move.Z < 0f)
205 { 214 {
206 if (actor != null && actor.IsColliding) 215 if (actor != null && actor.IsColliding)
216 { //##
217//Console.WriteLine("LAND FLYING"); // ##
207 return "LAND"; 218 return "LAND";
219 } //#
208 else 220 else
209 return "HOVER_DOWN"; 221 return "HOVER_DOWN";
210 } 222 }
@@ -218,19 +230,28 @@ namespace OpenSim.Region.Framework.Scenes.Animation
218 230
219 #region Falling/Floating/Landing 231 #region Falling/Floating/Landing
220 232
221 if (actor == null || !actor.IsColliding) 233// rm for jumping if (actor == null || !actor.IsColliding)
234 if ((actor == null || !actor.IsColliding) && !m_jumping) // add for jumping
222 { 235 {
223 float fallElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; 236// rm float fallElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
237 float fallElapsed = (float)(Environment.TickCount - m_animTickFall); // add, in mS
224 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f; 238 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f;
239//Console.WriteLine("falling t={0} v={1}", fallElapsed, fallVelocity); //##
240
241// rm for fall if (m_animTickFall == 0 || (fallElapsed > FALL_DELAY && fallVelocity >= 0.0f))
242 if (!m_jumping && (fallVelocity < -3.0f) ) m_falling = true; // add for falling and jumping
225 243
226 if (m_animTickFall == 0 || (fallElapsed > FALL_DELAY && fallVelocity >= 0.0f)) 244 if (m_animTickFall == 0 || (fallVelocity >= 0.0f)) // add for jumping
245 // not falling yet or going up
227 { 246 {
228 // Just started falling 247 // reset start of fall time
229 m_animTickFall = Environment.TickCount; 248 m_animTickFall = Environment.TickCount;
230 } 249 }
231 else if (!jumping && fallElapsed > FALL_DELAY) 250// else if (!jumping && fallElapsed > FALL_DELAY)
251 else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping
232 { 252 {
233 // Falling long enough to trigger the animation 253 // Falling long enough to trigger the animation
254//Console.WriteLine("FALLDOWN"); //##
234 return "FALLDOWN"; 255 return "FALLDOWN";
235 } 256 }
236 257
@@ -239,22 +260,97 @@ namespace OpenSim.Region.Framework.Scenes.Animation
239 260
240 #endregion Falling/Floating/Landing 261 #endregion Falling/Floating/Landing
241 262
263
264 #region Jumping // section added for jumping...
265
266 int jumptime;
267 jumptime = Environment.TickCount - m_animTickJump;
268
269
270 if ((move.Z > 0f) && (!m_jumping))
271 {
272//Console.WriteLine("PJ {0}", jumptime); //##
273 // Start jumping, prejump
274 m_animTickFall = 0;
275 m_jumping = true;
276 m_falling = false;
277 actor.Selected = true; // borrowed for jmping flag
278 m_animTickJump = Environment.TickCount;
279 m_jumpVelocity = 0.35f;
280 return "PREJUMP";
281 }
282
283 if(m_jumping)
284 {
285 if ( (jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
286 {
287//Console.WriteLine("LA {0}", jumptime); //##
288 // end jumping
289 m_jumping = false;
290 m_falling = false;
291 actor.Selected = false; // borrowed for jumping flag
292 m_jumpVelocity = 0f;
293 m_animTickFall = Environment.TickCount;
294 return "LAND";
295 }
296 else if (jumptime > JUMP_PERIOD)
297 {
298//Console.WriteLine("JD {0}", jumptime); //##
299 // jump down
300 m_jumpVelocity = 0f;
301 return "JUMP";
302 }
303 else if (jumptime > PREJUMP_DELAY)
304 {
305//Console.WriteLine("JU {0}", jumptime); //##
306 // jump up
307 m_jumping = true;
308 m_jumpVelocity = 10f;
309 return "JUMP";
310 }
311 }
312
313 #endregion Jumping // end added section
314
242 #region Ground Movement 315 #region Ground Movement
243 316
244 if (m_movementAnimation == "FALLDOWN") 317 if (m_movementAnimation == "FALLDOWN")
245 { 318 {
319 m_falling = false;
246 m_animTickFall = Environment.TickCount; 320 m_animTickFall = Environment.TickCount;
247
248 // TODO: SOFT_LAND support 321 // TODO: SOFT_LAND support
249 return "LAND"; 322 float fallHeight = m_fallHeight - actor.Position.Z;
323//Console.WriteLine("Hit from {0}", fallHeight); //##
324 if (fallHeight > 15.0f) // add for falling
325 return "STANDUP";
326 else if (fallHeight > 8.0f) // add for falling
327 return "SOFT_LAND"; // add for falling
328 else // add for falling
329 return "LAND"; // add for falling
250 } 330 }
251 else if (m_movementAnimation == "LAND") 331// rm jumping float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f;
332// rm jumping if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY))
333// rm for landing return "LAND";
334 else if ((m_movementAnimation == "LAND") || (m_movementAnimation == "SOFT_LAND") || (m_movementAnimation == "STANDUP"))
252 { 335 {
253 float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; 336 int landElapsed = Environment.TickCount - m_animTickFall; // add for jumping
254 if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY)) 337 int limit = 1000; // add for jumping
255 return "LAND"; 338 if(m_movementAnimation == "LAND") limit = 350; // add for jumping
256 } 339 // NB if the above is set too long a weird anim reset from some place prevents STAND from being sent to client
257 340
341 if ((m_animTickFall != 0) && (landElapsed <= limit)) // add for jumping
342 {
343//Console.WriteLine("Lelapse {0}", m_movementAnimation); //##
344 return m_movementAnimation;
345 }
346 else
347 {
348//Console.WriteLine("end/STAND"); //##
349 m_fallHeight = actor.Position.Z; // save latest flying height
350 return "STAND";
351 }
352 }
353/* This section removed, replaced by jumping section
258 m_animTickFall = 0; 354 m_animTickFall = 0;
259 355
260 if (move.Z > 0f) 356 if (move.Z > 0f)
@@ -266,7 +362,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
266 m_animTickJump = Environment.TickCount; 362 m_animTickJump = Environment.TickCount;
267 return "PREJUMP"; 363 return "PREJUMP";
268 } 364 }
269 else if (Environment.TickCount - m_animTickJump > PREJUMP_DELAY * 1000.0f) 365 else if (Environment.TickCount - m_animTickJump > PREJUMP_DELAY * 800.0f)
270 { 366 {
271 // Start actual jump 367 // Start actual jump
272 if (m_animTickJump == -1) 368 if (m_animTickJump == -1)
@@ -284,29 +380,34 @@ namespace OpenSim.Region.Framework.Scenes.Animation
284 { 380 {
285 // Not jumping 381 // Not jumping
286 m_animTickJump = 0; 382 m_animTickJump = 0;
287 383 */
288 if (move.X != 0f || move.Y != 0f) 384 // next section moved outside paren. and realigned for jumping
289 { 385 if (move.X != 0f || move.Y != 0f)
290 // Walking / crouchwalking / running 386 {
291 if (move.Z < 0f) 387 m_fallHeight = actor.Position.Z; // save latest flying height
292 return "CROUCHWALK"; 388 m_falling = false; // Add for falling
293 else if (m_scenePresence.SetAlwaysRun) 389 // Walking / crouchwalking / running
294 return "RUN"; 390 if (move.Z < 0f)
295 else 391 return "CROUCHWALK";
296 return "WALK"; 392 else if (m_scenePresence.SetAlwaysRun)
297 } 393 return "RUN";
298 else 394 else
299 { 395 return "WALK";
300 // Not walking
301 if (move.Z < 0f)
302 return "CROUCH";
303 else
304 return "STAND";
305 }
306 } 396 }
307 397// rm for jumping else
398 else if (!m_jumping) // add for jumping
399 {
400 m_falling = false; // Add for falling
401 // Not walking
402 if (move.Z < 0f)
403 return "CROUCH";
404 else
405 return "STAND";
406 }
407 // end section realign for jumping
308 #endregion Ground Movement 408 #endregion Ground Movement
309 409
410 m_falling = false; // Add for falling
310 return m_movementAnimation; 411 return m_movementAnimation;
311 } 412 }
312 413
@@ -316,16 +417,15 @@ namespace OpenSim.Region.Framework.Scenes.Animation
316 public void UpdateMovementAnimations() 417 public void UpdateMovementAnimations()
317 { 418 {
318 m_movementAnimation = GetMovementAnimation(); 419 m_movementAnimation = GetMovementAnimation();
319 420/* if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
320 if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
321 { 421 {
322 // This was the previous behavior before PREJUMP 422 // This was the previous behavior before PREJUMP
323 TrySetMovementAnimation("JUMP"); 423 TrySetMovementAnimation("JUMP");
324 } 424 }
325 else 425 else
326 { 426 { removed for jumping */
327 TrySetMovementAnimation(m_movementAnimation); 427 TrySetMovementAnimation(m_movementAnimation);
328 } 428// rm for jumping }
329 } 429 }
330 430
331 public UUID[] GetAnimationArray() 431 public UUID[] GetAnimationArray()
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 64567db..a8d24fd 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -104,8 +104,15 @@ namespace OpenSim.Region.Framework.Scenes
104 // better than losing the object for now. 104 // better than losing the object for now.
105 if (permissionToDelete) 105 if (permissionToDelete)
106 { 106 {
107 List<uint> killIDs = new List<uint>();
108
107 foreach (SceneObjectGroup g in objectGroups) 109 foreach (SceneObjectGroup g in objectGroups)
110 {
111 killIDs.Add(g.LocalId);
108 g.DeleteGroupFromScene(false); 112 g.DeleteGroupFromScene(false);
113 }
114
115 m_scene.SendKillObject(killIDs);
109 } 116 }
110 } 117 }
111 118
@@ -137,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
137 x = m_inventoryDeletes.Dequeue(); 144 x = m_inventoryDeletes.Dequeue();
138 145
139 m_log.DebugFormat( 146 m_log.DebugFormat(
140 "[ASYNC DELETER]: Sending object to user's inventory, {0} item(s) remaining.", left); 147 "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.", left, x.action, x.objectGroups.Count);
141 148
142 try 149 try
143 { 150 {
@@ -177,4 +184,4 @@ namespace OpenSim.Region.Framework.Scenes
177 return false; 184 return false;
178 } 185 }
179 } 186 }
180} \ No newline at end of file 187}
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index c321a15..f24c53c 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -55,8 +55,12 @@ namespace OpenSim.Region.Framework.Scenes
55 55
56 public delegate void OnTerrainTickDelegate(); 56 public delegate void OnTerrainTickDelegate();
57 57
58 public delegate void OnTerrainUpdateDelegate();
59
58 public event OnTerrainTickDelegate OnTerrainTick; 60 public event OnTerrainTickDelegate OnTerrainTick;
59 61
62 public event OnTerrainUpdateDelegate OnTerrainUpdate;
63
60 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); 64 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup);
61 65
62 public event OnBackupDelegate OnBackup; 66 public event OnBackupDelegate OnBackup;
@@ -757,6 +761,26 @@ namespace OpenSim.Region.Framework.Scenes
757 } 761 }
758 } 762 }
759 } 763 }
764 public void TriggerTerrainUpdate()
765 {
766 OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate;
767 if (handlerTerrainUpdate != null)
768 {
769 foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList())
770 {
771 try
772 {
773 d();
774 }
775 catch (Exception e)
776 {
777 m_log.ErrorFormat(
778 "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing. {0} {1}",
779 e.Message, e.StackTrace);
780 }
781 }
782 }
783 }
760 784
761 public void TriggerTerrainTick() 785 public void TriggerTerrainTick()
762 { 786 {
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 19f8180..c75f8ba 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -167,6 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
167 167
168 private double GetPriorityByFrontBack(IClientAPI client, ISceneEntity entity) 168 private double GetPriorityByFrontBack(IClientAPI client, ISceneEntity entity)
169 { 169 {
170 if (entity == null) return double.NaN;
170 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 171 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
171 if (presence != null) 172 if (presence != null)
172 { 173 {
@@ -226,9 +227,9 @@ namespace OpenSim.Region.Framework.Scenes
226 return 0.0; 227 return 0.0;
227 228
228 // Use group position for child prims 229 // Use group position for child prims
229 Vector3 entityPos = entity.AbsolutePosition; 230 Vector3 entityPos;
230 if (entity is SceneObjectPart) 231 if (entity is SceneObjectPart)
231 entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition; 232 entityPos = ((SceneObjectPart)entity).ParentGroup.AbsolutePosition;
232 else 233 else
233 entityPos = entity.AbsolutePosition; 234 entityPos = entity.AbsolutePosition;
234 235
@@ -251,12 +252,19 @@ namespace OpenSim.Region.Framework.Scenes
251 252
252 if (entity is SceneObjectPart) 253 if (entity is SceneObjectPart)
253 { 254 {
254 PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
255 if (physActor == null || !physActor.IsPhysical)
256 priority += 100;
257
258 if (((SceneObjectPart)entity).ParentGroup.RootPart.IsAttachment) 255 if (((SceneObjectPart)entity).ParentGroup.RootPart.IsAttachment)
256 {
259 priority = 1.0; 257 priority = 1.0;
258 }
259 else
260 {
261 PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
262 if (physActor == null || !physActor.IsPhysical)
263 priority += 100;
264 }
265
266 if (((SceneObjectPart)entity).ParentGroup.RootPart != (SceneObjectPart)entity)
267 priority +=1;
260 } 268 }
261 return priority; 269 return priority;
262 } 270 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a29b7f1..36ce245 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -99,34 +99,22 @@ namespace OpenSim.Region.Framework.Scenes
99 /// <param name="item"></param> 99 /// <param name="item"></param>
100 public bool AddInventoryItem(InventoryItemBase item) 100 public bool AddInventoryItem(InventoryItemBase item)
101 { 101 {
102 if (UUID.Zero == item.Folder) 102 InventoryFolderBase folder;
103
104 if (item.Folder == UUID.Zero)
103 { 105 {
104 InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType); 106 folder = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
105 if (f != null) 107 if (folder == null)
106 {
107// m_log.DebugFormat(
108// "[LOCAL INVENTORY SERVICES CONNECTOR]: Found folder {0} type {1} for item {2}",
109// f.Name, (AssetType)f.Type, item.Name);
110
111 item.Folder = f.ID;
112 }
113 else
114 { 108 {
115 f = InventoryService.GetRootFolder(item.Owner); 109 folder = InventoryService.GetRootFolder(item.Owner);
116 if (f != null) 110
117 { 111 if (folder == null)
118 item.Folder = f.ID;
119 }
120 else
121 {
122 m_log.WarnFormat(
123 "[AGENT INVENTORY]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
124 item.Owner, item.Name);
125 return false; 112 return false;
126 }
127 } 113 }
114
115 item.Folder = folder.ID;
128 } 116 }
129 117
130 if (InventoryService.AddItem(item)) 118 if (InventoryService.AddItem(item))
131 { 119 {
132 int userlevel = 0; 120 int userlevel = 0;
@@ -252,8 +240,7 @@ namespace OpenSim.Region.Framework.Scenes
252 240
253 // Update item with new asset 241 // Update item with new asset
254 item.AssetID = asset.FullID; 242 item.AssetID = asset.FullID;
255 if (group.UpdateInventoryItem(item)) 243 group.UpdateInventoryItem(item);
256 remoteClient.SendAgentAlertMessage("Script saved", false);
257 244
258 part.GetProperties(remoteClient); 245 part.GetProperties(remoteClient);
259 246
@@ -264,12 +251,7 @@ namespace OpenSim.Region.Framework.Scenes
264 { 251 {
265 // Needs to determine which engine was running it and use that 252 // Needs to determine which engine was running it and use that
266 // 253 //
267 part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); 254 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0);
268 errors = part.Inventory.GetScriptErrors(item.ItemID);
269 }
270 else
271 {
272 remoteClient.SendAgentAlertMessage("Script saved", false);
273 } 255 }
274 part.ParentGroup.ResumeScripts(); 256 part.ParentGroup.ResumeScripts();
275 return errors; 257 return errors;
@@ -684,6 +666,8 @@ namespace OpenSim.Region.Framework.Scenes
684 return; 666 return;
685 } 667 }
686 668
669 if (newName == null) newName = item.Name;
670
687 AssetBase asset = AssetService.Get(item.AssetID.ToString()); 671 AssetBase asset = AssetService.Get(item.AssetID.ToString());
688 672
689 if (asset != null) 673 if (asset != null)
@@ -731,6 +715,24 @@ namespace OpenSim.Region.Framework.Scenes
731 } 715 }
732 716
733 /// <summary> 717 /// <summary>
718 /// Move an item within the agent's inventory, and leave a copy (used in making a new outfit)
719 /// </summary>
720 public void MoveInventoryItemsLeaveCopy(IClientAPI remoteClient, List<InventoryItemBase> items, UUID destfolder)
721 {
722 List<InventoryItemBase> moveitems = new List<InventoryItemBase>();
723 foreach (InventoryItemBase b in items)
724 {
725 CopyInventoryItem(remoteClient, 0, remoteClient.AgentId, b.ID, b.Folder, null);
726 InventoryItemBase n = InventoryService.GetItem(b);
727 n.Folder = destfolder;
728 moveitems.Add(n);
729 remoteClient.SendInventoryItemCreateUpdate(n, 0);
730 }
731
732 MoveInventoryItem(remoteClient, moveitems);
733 }
734
735 /// <summary>
734 /// Move an item within the agent's inventory. 736 /// Move an item within the agent's inventory.
735 /// </summary> 737 /// </summary>
736 /// <param name="remoteClient"></param> 738 /// <param name="remoteClient"></param>
@@ -974,8 +976,12 @@ namespace OpenSim.Region.Framework.Scenes
974 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID) 976 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID)
975 { 977 {
976 SceneObjectPart part = GetSceneObjectPart(localID); 978 SceneObjectPart part = GetSceneObjectPart(localID);
977 SceneObjectGroup group = part.ParentGroup; 979 SceneObjectGroup group = null;
978 if (group != null) 980 if (part != null)
981 {
982 group = part.ParentGroup;
983 }
984 if (part != null && group != null)
979 { 985 {
980 if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId)) 986 if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
981 return; 987 return;
@@ -1424,13 +1430,6 @@ namespace OpenSim.Region.Framework.Scenes
1424 { 1430 {
1425 agentTransactions.HandleTaskItemUpdateFromTransaction( 1431 agentTransactions.HandleTaskItemUpdateFromTransaction(
1426 remoteClient, part, transactionID, currentItem); 1432 remoteClient, part, transactionID, currentItem);
1427
1428 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1429 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1430 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1431 remoteClient.SendAgentAlertMessage("Script saved", false);
1432 else
1433 remoteClient.SendAgentAlertMessage("Item saved", false);
1434 } 1433 }
1435 1434
1436 // Base ALWAYS has move 1435 // Base ALWAYS has move
@@ -1548,7 +1547,7 @@ namespace OpenSim.Region.Framework.Scenes
1548 return; 1547 return;
1549 1548
1550 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, 1549 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
1551 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), 1550 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),
1552 remoteClient.AgentId); 1551 remoteClient.AgentId);
1553 AssetService.Store(asset); 1552 AssetService.Store(asset);
1554 1553
@@ -1701,23 +1700,32 @@ namespace OpenSim.Region.Framework.Scenes
1701 // build a list of eligible objects 1700 // build a list of eligible objects
1702 List<uint> deleteIDs = new List<uint>(); 1701 List<uint> deleteIDs = new List<uint>();
1703 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); 1702 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
1704 1703 List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
1705 // Start with true for both, then remove the flags if objects
1706 // that we can't derez are part of the selection
1707 bool permissionToTake = true;
1708 bool permissionToTakeCopy = true;
1709 bool permissionToDelete = true;
1710 1704
1711 foreach (uint localID in localIDs) 1705 foreach (uint localID in localIDs)
1712 { 1706 {
1707 // Start with true for both, then remove the flags if objects
1708 // that we can't derez are part of the selection
1709 bool permissionToTake = true;
1710 bool permissionToTakeCopy = true;
1711 bool permissionToDelete = true;
1712
1713 // Invalid id 1713 // Invalid id
1714 SceneObjectPart part = GetSceneObjectPart(localID); 1714 SceneObjectPart part = GetSceneObjectPart(localID);
1715 if (part == null) 1715 if (part == null)
1716 {
1717 //Client still thinks the object exists, kill it
1718 deleteIDs.Add(localID);
1716 continue; 1719 continue;
1720 }
1717 1721
1718 // Already deleted by someone else 1722 // Already deleted by someone else
1719 if (part.ParentGroup == null || part.ParentGroup.IsDeleted) 1723 if (part.ParentGroup == null || part.ParentGroup.IsDeleted)
1724 {
1725 //Client still thinks the object exists, kill it
1726 deleteIDs.Add(localID);
1720 continue; 1727 continue;
1728 }
1721 1729
1722 // Can't delete child prims 1730 // Can't delete child prims
1723 if (part != part.ParentGroup.RootPart) 1731 if (part != part.ParentGroup.RootPart)
@@ -1725,9 +1733,6 @@ namespace OpenSim.Region.Framework.Scenes
1725 1733
1726 SceneObjectGroup grp = part.ParentGroup; 1734 SceneObjectGroup grp = part.ParentGroup;
1727 1735
1728 deleteIDs.Add(localID);
1729 deleteGroups.Add(grp);
1730
1731 if (remoteClient == null) 1736 if (remoteClient == null)
1732 { 1737 {
1733 // Autoreturn has a null client. Nothing else does. So 1738 // Autoreturn has a null client. Nothing else does. So
@@ -1739,8 +1744,15 @@ namespace OpenSim.Region.Framework.Scenes
1739 } 1744 }
1740 else 1745 else
1741 { 1746 {
1742 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) 1747 if (action == DeRezAction.TakeCopy)
1748 {
1749 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
1750 permissionToTakeCopy = false;
1751 }
1752 else
1753 {
1743 permissionToTakeCopy = false; 1754 permissionToTakeCopy = false;
1755 }
1744 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) 1756 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
1745 permissionToTake = false; 1757 permissionToTake = false;
1746 1758
@@ -1748,71 +1760,88 @@ namespace OpenSim.Region.Framework.Scenes
1748 permissionToDelete = false; 1760 permissionToDelete = false;
1749 } 1761 }
1750 1762
1751 } 1763 // Handle god perms
1752 1764 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
1753 // Handle god perms 1765 {
1754 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId)) 1766 permissionToTake = true;
1755 { 1767 permissionToTakeCopy = true;
1756 permissionToTake = true; 1768 permissionToDelete = true;
1757 permissionToTakeCopy = true; 1769 }
1758 permissionToDelete = true;
1759 }
1760 1770
1761 // If we're re-saving, we don't even want to delete 1771 // If we're re-saving, we don't even want to delete
1762 if (action == DeRezAction.SaveToExistingUserInventoryItem) 1772 if (action == DeRezAction.SaveToExistingUserInventoryItem)
1763 permissionToDelete = false; 1773 permissionToDelete = false;
1764 1774
1765 // if we want to take a copy, we also don't want to delete 1775 // if we want to take a copy, we also don't want to delete
1766 // Note: after this point, the permissionToTakeCopy flag 1776 // Note: after this point, the permissionToTakeCopy flag
1767 // becomes irrelevant. It already includes the permissionToTake 1777 // becomes irrelevant. It already includes the permissionToTake
1768 // permission and after excluding no copy items here, we can 1778 // permission and after excluding no copy items here, we can
1769 // just use that. 1779 // just use that.
1770 if (action == DeRezAction.TakeCopy) 1780 if (action == DeRezAction.TakeCopy)
1771 { 1781 {
1772 // If we don't have permission, stop right here 1782 // If we don't have permission, stop right here
1773 if (!permissionToTakeCopy) 1783 if (!permissionToTakeCopy)
1774 return; 1784 return;
1775 1785
1776 permissionToTake = true; 1786 permissionToTake = true;
1777 // Don't delete 1787 // Don't delete
1778 permissionToDelete = false; 1788 permissionToDelete = false;
1779 } 1789 }
1780 1790
1781 if (action == DeRezAction.Return) 1791 if (action == DeRezAction.Return)
1782 {
1783 if (remoteClient != null)
1784 { 1792 {
1785 if (Permissions.CanReturnObjects( 1793 if (remoteClient != null)
1786 null,
1787 remoteClient.AgentId,
1788 deleteGroups))
1789 { 1794 {
1790 permissionToTake = true; 1795 if (Permissions.CanReturnObjects(
1791 permissionToDelete = true; 1796 null,
1792 1797 remoteClient.AgentId,
1793 foreach (SceneObjectGroup g in deleteGroups) 1798 deleteGroups))
1794 { 1799 {
1795 AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); 1800 permissionToTake = true;
1801 permissionToDelete = true;
1802
1803 AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
1796 } 1804 }
1797 } 1805 }
1806 else // Auto return passes through here with null agent
1807 {
1808 permissionToTake = true;
1809 permissionToDelete = true;
1810 }
1798 } 1811 }
1799 else // Auto return passes through here with null agent 1812
1813 if (permissionToTake && (!permissionToDelete))
1814 takeGroups.Add(grp);
1815
1816 if (permissionToDelete)
1800 { 1817 {
1801 permissionToTake = true; 1818 if (permissionToTake)
1802 permissionToDelete = true; 1819 deleteGroups.Add(grp);
1820 deleteIDs.Add(grp.LocalId);
1803 } 1821 }
1804 } 1822 }
1805 1823
1806 if (permissionToTake) 1824 SendKillObject(deleteIDs);
1825
1826 if (deleteGroups.Count > 0)
1807 { 1827 {
1828 foreach (SceneObjectGroup g in deleteGroups)
1829 deleteIDs.Remove(g.LocalId);
1830
1808 m_asyncSceneObjectDeleter.DeleteToInventory( 1831 m_asyncSceneObjectDeleter.DeleteToInventory(
1809 action, destinationID, deleteGroups, remoteClient, 1832 action, destinationID, deleteGroups, remoteClient,
1810 permissionToDelete); 1833 true);
1834 }
1835 if (takeGroups.Count > 0)
1836 {
1837 m_asyncSceneObjectDeleter.DeleteToInventory(
1838 action, destinationID, takeGroups, remoteClient,
1839 false);
1811 } 1840 }
1812 else if (permissionToDelete) 1841 if (deleteIDs.Count > 0)
1813 { 1842 {
1814 foreach (SceneObjectGroup g in deleteGroups) 1843 foreach (SceneObjectGroup g in deleteGroups)
1815 DeleteSceneObject(g, false); 1844 DeleteSceneObject(g, true);
1816 } 1845 }
1817 } 1846 }
1818 1847
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4fc2cbc..d3a4678 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.Framework.Scenes
84 // TODO: need to figure out how allow client agents but deny 84 // TODO: need to figure out how allow client agents but deny
85 // root agents when ACL denies access to root agent 85 // root agents when ACL denies access to root agent
86 public bool m_strictAccessControl = true; 86 public bool m_strictAccessControl = true;
87 public bool m_seeIntoBannedRegion = false;
87 public int MaxUndoCount = 5; 88 public int MaxUndoCount = 5;
88 public bool LoginsDisabled = true; 89 public bool LoginsDisabled = true;
89 public bool LoadingPrims; 90 public bool LoadingPrims;
@@ -102,6 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
102 protected ModuleLoader m_moduleLoader; 103 protected ModuleLoader m_moduleLoader;
103 protected AgentCircuitManager m_authenticateHandler; 104 protected AgentCircuitManager m_authenticateHandler;
104 protected SceneCommunicationService m_sceneGridService; 105 protected SceneCommunicationService m_sceneGridService;
106 protected ISnmpModule m_snmpService = null;
105 107
106 protected ISimulationDataService m_SimulationDataService; 108 protected ISimulationDataService m_SimulationDataService;
107 protected IEstateDataService m_EstateDataService; 109 protected IEstateDataService m_EstateDataService;
@@ -163,6 +165,7 @@ namespace OpenSim.Region.Framework.Scenes
163 private int landMS; 165 private int landMS;
164 private int lastCompletedFrame; 166 private int lastCompletedFrame;
165 167
168 public bool CombineRegions = false;
166 private bool m_physics_enabled = true; 169 private bool m_physics_enabled = true;
167 private bool m_scripts_enabled = true; 170 private bool m_scripts_enabled = true;
168 private string m_defaultScriptEngine; 171 private string m_defaultScriptEngine;
@@ -220,6 +223,19 @@ namespace OpenSim.Region.Framework.Scenes
220 get { return m_sceneGridService; } 223 get { return m_sceneGridService; }
221 } 224 }
222 225
226 public ISnmpModule SnmpService
227 {
228 get
229 {
230 if (m_snmpService == null)
231 {
232 m_snmpService = RequestModuleInterface<ISnmpModule>();
233 }
234
235 return m_snmpService;
236 }
237 }
238
223 public ISimulationDataService SimulationDataService 239 public ISimulationDataService SimulationDataService
224 { 240 {
225 get 241 get
@@ -564,6 +580,8 @@ namespace OpenSim.Region.Framework.Scenes
564 #region Region Settings 580 #region Region Settings
565 581
566 // Load region settings 582 // Load region settings
583 m_regInfo.WindlightSettings = SimulationDataService.LoadRegionWindlightSettings(m_regInfo.RegionID);
584
567 m_regInfo.RegionSettings = simDataService.LoadRegionSettings(m_regInfo.RegionID); 585 m_regInfo.RegionSettings = simDataService.LoadRegionSettings(m_regInfo.RegionID);
568 if (estateDataService != null) 586 if (estateDataService != null)
569 m_regInfo.EstateSettings = estateDataService.LoadEstateSettings(m_regInfo.RegionID, false); 587 m_regInfo.EstateSettings = estateDataService.LoadEstateSettings(m_regInfo.RegionID, false);
@@ -623,9 +641,10 @@ namespace OpenSim.Region.Framework.Scenes
623 //Animation states 641 //Animation states
624 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); 642 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
625 // TODO: Change default to true once the feature is supported 643 // TODO: Change default to true once the feature is supported
626 m_usePreJump = startupConfig.GetBoolean("enableprejump", false); 644 m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
627
628 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 645 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
646
647 m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");
629 if (RegionInfo.NonphysPrimMax > 0) 648 if (RegionInfo.NonphysPrimMax > 0)
630 { 649 {
631 m_maxNonphys = RegionInfo.NonphysPrimMax; 650 m_maxNonphys = RegionInfo.NonphysPrimMax;
@@ -657,6 +676,7 @@ namespace OpenSim.Region.Framework.Scenes
657 m_persistAfter *= 10000000; 676 m_persistAfter *= 10000000;
658 677
659 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 678 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
679 m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
660 680
661 IConfig packetConfig = m_config.Configs["PacketPool"]; 681 IConfig packetConfig = m_config.Configs["PacketPool"];
662 if (packetConfig != null) 682 if (packetConfig != null)
@@ -666,6 +686,8 @@ namespace OpenSim.Region.Framework.Scenes
666 } 686 }
667 687
668 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); 688 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
689 m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
690 CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
669 691
670 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true); 692 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
671 if (m_generateMaptiles) 693 if (m_generateMaptiles)
@@ -690,9 +712,9 @@ namespace OpenSim.Region.Framework.Scenes
690 } 712 }
691 } 713 }
692 } 714 }
693 catch 715 catch (Exception e)
694 { 716 {
695 m_log.Warn("[SCENE]: Failed to load StartupConfig"); 717 m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());
696 } 718 }
697 719
698 #endregion Region Config 720 #endregion Region Config
@@ -899,6 +921,15 @@ namespace OpenSim.Region.Framework.Scenes
899 /// <param name="seconds">float indicating duration before restart.</param> 921 /// <param name="seconds">float indicating duration before restart.</param>
900 public virtual void Restart(float seconds) 922 public virtual void Restart(float seconds)
901 { 923 {
924 Restart(seconds, true);
925 }
926
927 /// <summary>
928 /// Given float seconds, this will restart the region. showDialog will optionally alert the users.
929 /// </summary>
930 /// <param name="seconds">float indicating duration before restart.</param>
931 public virtual void Restart(float seconds, bool showDialog)
932 {
902 // notifications are done in 15 second increments 933 // notifications are done in 15 second increments
903 // so .. if the number of seconds is less then 15 seconds, it's not really a restart request 934 // so .. if the number of seconds is less then 15 seconds, it's not really a restart request
904 // It's a 'Cancel restart' request. 935 // It's a 'Cancel restart' request.
@@ -919,8 +950,11 @@ namespace OpenSim.Region.Framework.Scenes
919 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); 950 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
920 m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes"); 951 m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes");
921 m_restartTimer.Start(); 952 m_restartTimer.Start();
922 m_dialogModule.SendNotificationToUsersInRegion( 953 if (showDialog)
954 {
955 m_dialogModule.SendNotificationToUsersInRegion(
923 UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0))); 956 UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0)));
957 }
924 } 958 }
925 } 959 }
926 960
@@ -1116,6 +1150,7 @@ namespace OpenSim.Region.Framework.Scenes
1116 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 1150 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
1117 if (HeartbeatThread != null) 1151 if (HeartbeatThread != null)
1118 { 1152 {
1153 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
1119 HeartbeatThread.Abort(); 1154 HeartbeatThread.Abort();
1120 HeartbeatThread = null; 1155 HeartbeatThread = null;
1121 } 1156 }
@@ -1787,14 +1822,24 @@ namespace OpenSim.Region.Framework.Scenes
1787 /// <returns></returns> 1822 /// <returns></returns>
1788 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) 1823 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
1789 { 1824 {
1825
1826 float wheight = (float)RegionInfo.RegionSettings.WaterHeight;
1827 Vector3 wpos = Vector3.Zero;
1828 // Check for water surface intersection from above
1829 if ( (RayStart.Z > wheight) && (RayEnd.Z < wheight) )
1830 {
1831 float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z);
1832 wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X));
1833 wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y));
1834 wpos.Z = wheight;
1835 }
1836
1790 Vector3 pos = Vector3.Zero; 1837 Vector3 pos = Vector3.Zero;
1791 if (RayEndIsIntersection == (byte)1) 1838 if (RayEndIsIntersection == (byte)1)
1792 { 1839 {
1793 pos = RayEnd; 1840 pos = RayEnd;
1794 return pos;
1795 } 1841 }
1796 1842 else if (RayTargetID != UUID.Zero)
1797 if (RayTargetID != UUID.Zero)
1798 { 1843 {
1799 SceneObjectPart target = GetSceneObjectPart(RayTargetID); 1844 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
1800 1845
@@ -1816,7 +1861,7 @@ namespace OpenSim.Region.Framework.Scenes
1816 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter); 1861 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter);
1817 1862
1818 // Un-comment out the following line to Get Raytrace results printed to the console. 1863 // Un-comment out the following line to Get Raytrace results printed to the console.
1819 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); 1864 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
1820 float ScaleOffset = 0.5f; 1865 float ScaleOffset = 0.5f;
1821 1866
1822 // If we hit something 1867 // If we hit something
@@ -1839,13 +1884,10 @@ namespace OpenSim.Region.Framework.Scenes
1839 //pos.Z -= 0.25F; 1884 //pos.Z -= 0.25F;
1840 1885
1841 } 1886 }
1842
1843 return pos;
1844 } 1887 }
1845 else 1888 else
1846 { 1889 {
1847 // We don't have a target here, so we're going to raytrace all the objects in the scene. 1890 // We don't have a target here, so we're going to raytrace all the objects in the scene.
1848
1849 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false); 1891 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false);
1850 1892
1851 // Un-comment the following line to print the raytrace results to the console. 1893 // Un-comment the following line to print the raytrace results to the console.
@@ -1854,13 +1896,12 @@ namespace OpenSim.Region.Framework.Scenes
1854 if (ei.HitTF) 1896 if (ei.HitTF)
1855 { 1897 {
1856 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); 1898 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
1857 } else 1899 }
1900 else
1858 { 1901 {
1859 // fall back to our stupid functionality 1902 // fall back to our stupid functionality
1860 pos = RayEnd; 1903 pos = RayEnd;
1861 } 1904 }
1862
1863 return pos;
1864 } 1905 }
1865 } 1906 }
1866 else 1907 else
@@ -1871,8 +1912,12 @@ namespace OpenSim.Region.Framework.Scenes
1871 //increase height so its above the ground. 1912 //increase height so its above the ground.
1872 //should be getting the normal of the ground at the rez point and using that? 1913 //should be getting the normal of the ground at the rez point and using that?
1873 pos.Z += scale.Z / 2f; 1914 pos.Z += scale.Z / 2f;
1874 return pos; 1915// return pos;
1875 } 1916 }
1917
1918 // check against posible water intercept
1919 if (wpos.Z > pos.Z) pos = wpos;
1920 return pos;
1876 } 1921 }
1877 1922
1878 1923
@@ -1952,7 +1997,10 @@ namespace OpenSim.Region.Framework.Scenes
1952 public bool AddRestoredSceneObject( 1997 public bool AddRestoredSceneObject(
1953 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 1998 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
1954 { 1999 {
1955 return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); 2000 bool result = m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
2001 if (result)
2002 sceneObject.IsDeleted = false;
2003 return result;
1956 } 2004 }
1957 2005
1958 /// <summary> 2006 /// <summary>
@@ -2029,6 +2077,15 @@ namespace OpenSim.Region.Framework.Scenes
2029 /// </summary> 2077 /// </summary>
2030 public void DeleteAllSceneObjects() 2078 public void DeleteAllSceneObjects()
2031 { 2079 {
2080 DeleteAllSceneObjects(false);
2081 }
2082
2083 /// <summary>
2084 /// Delete every object from the scene. This does not include attachments worn by avatars.
2085 /// </summary>
2086 public void DeleteAllSceneObjects(bool exceptNoCopy)
2087 {
2088 List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
2032 lock (Entities) 2089 lock (Entities)
2033 { 2090 {
2034 EntityBase[] entities = Entities.GetEntities(); 2091 EntityBase[] entities = Entities.GetEntities();
@@ -2037,11 +2094,24 @@ namespace OpenSim.Region.Framework.Scenes
2037 if (e is SceneObjectGroup) 2094 if (e is SceneObjectGroup)
2038 { 2095 {
2039 SceneObjectGroup sog = (SceneObjectGroup)e; 2096 SceneObjectGroup sog = (SceneObjectGroup)e;
2040 if (!sog.IsAttachment) 2097 if (sog != null && !sog.IsAttachment)
2041 DeleteSceneObject((SceneObjectGroup)e, false); 2098 {
2099 if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
2100 {
2101 DeleteSceneObject((SceneObjectGroup)e, false);
2102 }
2103 else
2104 {
2105 toReturn.Add((SceneObjectGroup)e);
2106 }
2107 }
2042 } 2108 }
2043 } 2109 }
2044 } 2110 }
2111 if (toReturn.Count > 0)
2112 {
2113 returnObjects(toReturn.ToArray(), UUID.Zero);
2114 }
2045 } 2115 }
2046 2116
2047 /// <summary> 2117 /// <summary>
@@ -2090,6 +2160,8 @@ namespace OpenSim.Region.Framework.Scenes
2090 } 2160 }
2091 2161
2092 group.DeleteGroupFromScene(silent); 2162 group.DeleteGroupFromScene(silent);
2163 if (!silent)
2164 SendKillObject(new List<uint>() { group.LocalId });
2093 2165
2094// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); 2166// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
2095 } 2167 }
@@ -2419,6 +2491,12 @@ namespace OpenSim.Region.Framework.Scenes
2419 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> 2491 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
2420 public bool AddSceneObject(SceneObjectGroup sceneObject) 2492 public bool AddSceneObject(SceneObjectGroup sceneObject)
2421 { 2493 {
2494 if (sceneObject.OwnerID == UUID.Zero)
2495 {
2496 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID);
2497 return false;
2498 }
2499
2422 // If the user is banned, we won't let any of their objects 2500 // If the user is banned, we won't let any of their objects
2423 // enter. Period. 2501 // enter. Period.
2424 // 2502 //
@@ -2466,15 +2544,28 @@ namespace OpenSim.Region.Framework.Scenes
2466 2544
2467 if (AttachmentsModule != null) 2545 if (AttachmentsModule != null)
2468 AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false); 2546 AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false);
2547
2548 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was found, attaching", sceneObject.UUID);
2469 } 2549 }
2470 else 2550 else
2471 { 2551 {
2552 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID);
2472 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2553 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2473 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2554 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2474 } 2555 }
2556 if (sceneObject.OwnerID == UUID.Zero)
2557 {
2558 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID);
2559 return false;
2560 }
2475 } 2561 }
2476 else 2562 else
2477 { 2563 {
2564 if (sceneObject.OwnerID == UUID.Zero)
2565 {
2566 m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID);
2567 return false;
2568 }
2478 AddRestoredSceneObject(sceneObject, true, false); 2569 AddRestoredSceneObject(sceneObject, true, false);
2479 2570
2480 if (!Permissions.CanObjectEntry(sceneObject.UUID, 2571 if (!Permissions.CanObjectEntry(sceneObject.UUID,
@@ -2587,12 +2678,19 @@ namespace OpenSim.Region.Framework.Scenes
2587 } 2678 }
2588 } 2679 }
2589 2680
2590 if (GetScenePresence(client.AgentId) != null) 2681 if (TryGetScenePresence(client.AgentId, out presence))
2591 { 2682 {
2592 m_LastLogin = Util.EnvironmentTickCount(); 2683 m_LastLogin = Util.EnvironmentTickCount();
2593 EventManager.TriggerOnNewClient(client); 2684 EventManager.TriggerOnNewClient(client);
2594 if (vialogin) 2685 if (vialogin)
2686 {
2595 EventManager.TriggerOnClientLogin(client); 2687 EventManager.TriggerOnClientLogin(client);
2688
2689 // Send initial parcel data
2690 Vector3 pos = presence.AbsolutePosition;
2691 ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y);
2692 land.SendLandUpdateToClient(presence.ControllingClient);
2693 }
2596 } 2694 }
2597 } 2695 }
2598 2696
@@ -2747,6 +2845,7 @@ namespace OpenSim.Region.Framework.Scenes
2747 client.OnFetchInventory += HandleFetchInventory; 2845 client.OnFetchInventory += HandleFetchInventory;
2748 client.OnUpdateInventoryItem += UpdateInventoryItemAsset; 2846 client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
2749 client.OnCopyInventoryItem += CopyInventoryItem; 2847 client.OnCopyInventoryItem += CopyInventoryItem;
2848 client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy;
2750 client.OnMoveInventoryItem += MoveInventoryItem; 2849 client.OnMoveInventoryItem += MoveInventoryItem;
2751 client.OnRemoveInventoryItem += RemoveInventoryItem; 2850 client.OnRemoveInventoryItem += RemoveInventoryItem;
2752 client.OnRemoveInventoryFolder += RemoveInventoryFolder; 2851 client.OnRemoveInventoryFolder += RemoveInventoryFolder;
@@ -2925,15 +3024,16 @@ namespace OpenSim.Region.Framework.Scenes
2925 /// </summary> 3024 /// </summary>
2926 /// <param name="agentId">The avatar's Unique ID</param> 3025 /// <param name="agentId">The avatar's Unique ID</param>
2927 /// <param name="client">The IClientAPI for the client</param> 3026 /// <param name="client">The IClientAPI for the client</param>
2928 public virtual void TeleportClientHome(UUID agentId, IClientAPI client) 3027 public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
2929 { 3028 {
2930 if (m_teleportModule != null) 3029 if (m_teleportModule != null)
2931 m_teleportModule.TeleportHome(agentId, client); 3030 return m_teleportModule.TeleportHome(agentId, client);
2932 else 3031 else
2933 { 3032 {
2934 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); 3033 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
2935 client.SendTeleportFailed("Unable to perform teleports on this simulator."); 3034 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
2936 } 3035 }
3036 return false;
2937 } 3037 }
2938 3038
2939 /// <summary> 3039 /// <summary>
@@ -3032,6 +3132,16 @@ namespace OpenSim.Region.Framework.Scenes
3032 /// <param name="flags"></param> 3132 /// <param name="flags"></param>
3033 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags) 3133 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
3034 { 3134 {
3135 //Add half the avatar's height so that the user doesn't fall through prims
3136 ScenePresence presence;
3137 if (TryGetScenePresence(remoteClient.AgentId, out presence))
3138 {
3139 if (presence.Appearance != null)
3140 {
3141 position.Z = position.Z + (presence.Appearance.AvatarHeight / 2);
3142 }
3143 }
3144
3035 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt)) 3145 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
3036 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. 3146 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
3037 m_dialogModule.SendAlertToUser(remoteClient, "Home position set."); 3147 m_dialogModule.SendAlertToUser(remoteClient, "Home position set.");
@@ -3125,7 +3235,9 @@ namespace OpenSim.Region.Framework.Scenes
3125 regions.Remove(RegionInfo.RegionHandle); 3235 regions.Remove(RegionInfo.RegionHandle);
3126 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); 3236 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
3127 } 3237 }
3238 m_log.Debug("[Scene] Beginning ClientClosed");
3128 m_eventManager.TriggerClientClosed(agentID, this); 3239 m_eventManager.TriggerClientClosed(agentID, this);
3240 m_log.Debug("[Scene] Finished ClientClosed");
3129 } 3241 }
3130 catch (NullReferenceException) 3242 catch (NullReferenceException)
3131 { 3243 {
@@ -3133,7 +3245,12 @@ namespace OpenSim.Region.Framework.Scenes
3133 // Avatar is already disposed :/ 3245 // Avatar is already disposed :/
3134 } 3246 }
3135 3247
3248 m_log.Debug("[Scene] Beginning OnRemovePresence");
3136 m_eventManager.TriggerOnRemovePresence(agentID); 3249 m_eventManager.TriggerOnRemovePresence(agentID);
3250 m_log.Debug("[Scene] Finished OnRemovePresence");
3251
3252 if (avatar != null && (!avatar.IsChildAgent))
3253 avatar.SaveChangedAttachments();
3137 3254
3138 if (avatar != null && (!avatar.IsChildAgent)) 3255 if (avatar != null && (!avatar.IsChildAgent))
3139 avatar.SaveChangedAttachments(); 3256 avatar.SaveChangedAttachments();
@@ -3142,7 +3259,7 @@ namespace OpenSim.Region.Framework.Scenes
3142 delegate(IClientAPI client) 3259 delegate(IClientAPI client)
3143 { 3260 {
3144 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway 3261 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway
3145 try { client.SendKillObject(avatar.RegionHandle, avatar.LocalId); } 3262 try { client.SendKillObject(avatar.RegionHandle, new List<uint>() { avatar.LocalId}); }
3146 catch (NullReferenceException) { } 3263 catch (NullReferenceException) { }
3147 }); 3264 });
3148 3265
@@ -3153,8 +3270,11 @@ namespace OpenSim.Region.Framework.Scenes
3153 } 3270 }
3154 3271
3155 // Remove the avatar from the scene 3272 // Remove the avatar from the scene
3273 m_log.Debug("[Scene] Begin RemoveScenePresence");
3156 m_sceneGraph.RemoveScenePresence(agentID); 3274 m_sceneGraph.RemoveScenePresence(agentID);
3275 m_log.Debug("[Scene] Finished RemoveScenePresence. Removing the client manager");
3157 m_clientManager.Remove(agentID); 3276 m_clientManager.Remove(agentID);
3277 m_log.Debug("[Scene] Removed the client manager. Firing avatar.close");
3158 3278
3159 try 3279 try
3160 { 3280 {
@@ -3168,9 +3288,10 @@ namespace OpenSim.Region.Framework.Scenes
3168 { 3288 {
3169 m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString()); 3289 m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString());
3170 } 3290 }
3171 3291 m_log.Debug("[Scene] Done. Firing RemoveCircuit");
3172 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); 3292 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
3173 CleanDroppedAttachments(); 3293 CleanDroppedAttachments();
3294 m_log.Debug("[Scene] The avatar has left the building");
3174 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 3295 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
3175 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); 3296 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
3176 } 3297 }
@@ -3201,18 +3322,24 @@ namespace OpenSim.Region.Framework.Scenes
3201 3322
3202 #region Entities 3323 #region Entities
3203 3324
3204 public void SendKillObject(uint localID) 3325 public void SendKillObject(List<uint> localIDs)
3205 { 3326 {
3206 SceneObjectPart part = GetSceneObjectPart(localID); 3327 List<uint> deleteIDs = new List<uint>();
3207 if (part != null) // It is a prim 3328
3329 foreach (uint localID in localIDs)
3208 { 3330 {
3209 if (part.ParentGroup != null && !part.ParentGroup.IsDeleted) // Valid 3331 SceneObjectPart part = GetSceneObjectPart(localID);
3332 if (part != null) // It is a prim
3210 { 3333 {
3211 if (part.ParentGroup.RootPart != part) // Child part 3334 if (part.ParentGroup != null && !part.ParentGroup.IsDeleted) // Valid
3212 return; 3335 {
3336 if (part.ParentGroup.RootPart != part) // Child part
3337 continue;
3338 }
3213 } 3339 }
3340 deleteIDs.Add(localID);
3214 } 3341 }
3215 ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); }); 3342 ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
3216 } 3343 }
3217 3344
3218 #endregion 3345 #endregion
@@ -3230,7 +3357,6 @@ namespace OpenSim.Region.Framework.Scenes
3230 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; 3357 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
3231 //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; 3358 //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
3232 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; 3359 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
3233 m_sceneGridService.KiPrimitive += SendKillObject;
3234 m_sceneGridService.OnGetLandData += GetLandData; 3360 m_sceneGridService.OnGetLandData += GetLandData;
3235 } 3361 }
3236 3362
@@ -3239,7 +3365,6 @@ namespace OpenSim.Region.Framework.Scenes
3239 /// </summary> 3365 /// </summary>
3240 public void UnRegisterRegionWithComms() 3366 public void UnRegisterRegionWithComms()
3241 { 3367 {
3242 m_sceneGridService.KiPrimitive -= SendKillObject;
3243 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; 3368 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
3244 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; 3369 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
3245 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate; 3370 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
@@ -3326,6 +3451,7 @@ namespace OpenSim.Region.Framework.Scenes
3326 { 3451 {
3327 if (land != null && !TestLandRestrictions(agent, land, out reason)) 3452 if (land != null && !TestLandRestrictions(agent, land, out reason))
3328 { 3453 {
3454 m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
3329 return false; 3455 return false;
3330 } 3456 }
3331 } 3457 }
@@ -3443,6 +3569,8 @@ namespace OpenSim.Region.Framework.Scenes
3443 } 3569 }
3444 } 3570 }
3445 // Honor parcel landing type and position. 3571 // Honor parcel landing type and position.
3572 /*
3573 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3446 if (land != null) 3574 if (land != null)
3447 { 3575 {
3448 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) 3576 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
@@ -3450,6 +3578,7 @@ namespace OpenSim.Region.Framework.Scenes
3450 agent.startpos = land.LandData.UserLocation; 3578 agent.startpos = land.LandData.UserLocation;
3451 } 3579 }
3452 } 3580 }
3581 */// This is now handled properly in ScenePresence.MakeRootAgent
3453 } 3582 }
3454 3583
3455 return true; 3584 return true;
@@ -3545,7 +3674,7 @@ namespace OpenSim.Region.Framework.Scenes
3545 3674
3546 if (m_regInfo.EstateSettings != null) 3675 if (m_regInfo.EstateSettings != null)
3547 { 3676 {
3548 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 3677 if ((!m_seeIntoBannedRegion) && m_regInfo.EstateSettings.IsBanned(agent.AgentID))
3549 { 3678 {
3550 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", 3679 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
3551 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 3680 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
@@ -3735,6 +3864,12 @@ namespace OpenSim.Region.Framework.Scenes
3735 3864
3736 // We have to wait until the viewer contacts this region after receiving EAC. 3865 // We have to wait until the viewer contacts this region after receiving EAC.
3737 // That calls AddNewClient, which finally creates the ScenePresence 3866 // That calls AddNewClient, which finally creates the ScenePresence
3867 if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID))
3868 {
3869 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
3870 return false;
3871 }
3872
3738 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); 3873 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
3739 if (nearestParcel == null) 3874 if (nearestParcel == null)
3740 { 3875 {
@@ -3742,6 +3877,14 @@ namespace OpenSim.Region.Framework.Scenes
3742 return false; 3877 return false;
3743 } 3878 }
3744 3879
3880 int num = m_sceneGraph.GetNumberOfScenePresences();
3881
3882 if (num >= RegionInfo.RegionSettings.AgentLimit)
3883 {
3884 if (!Permissions.IsAdministrator(cAgentData.AgentID))
3885 return false;
3886 }
3887
3745 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3888 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3746 if (childAgentUpdate != null) 3889 if (childAgentUpdate != null)
3747 { 3890 {
@@ -3807,12 +3950,22 @@ namespace OpenSim.Region.Framework.Scenes
3807 return false; 3950 return false;
3808 } 3951 }
3809 3952
3953 public bool IncomingCloseAgent(UUID agentID)
3954 {
3955 return IncomingCloseAgent(agentID, false);
3956 }
3957
3958 public bool IncomingCloseChildAgent(UUID agentID)
3959 {
3960 return IncomingCloseAgent(agentID, true);
3961 }
3962
3810 /// <summary> 3963 /// <summary>
3811 /// Tell a single agent to disconnect from the region. 3964 /// Tell a single agent to disconnect from the region.
3812 /// </summary> 3965 /// </summary>
3813 /// <param name="regionHandle"></param>
3814 /// <param name="agentID"></param> 3966 /// <param name="agentID"></param>
3815 public bool IncomingCloseAgent(UUID agentID) 3967 /// <param name="childOnly"></param>
3968 public bool IncomingCloseAgent(UUID agentID, bool childOnly)
3816 { 3969 {
3817 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); 3970 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
3818 3971
@@ -3824,7 +3977,7 @@ namespace OpenSim.Region.Framework.Scenes
3824 { 3977 {
3825 m_sceneGraph.removeUserCount(false); 3978 m_sceneGraph.removeUserCount(false);
3826 } 3979 }
3827 else 3980 else if (!childOnly)
3828 { 3981 {
3829 m_sceneGraph.removeUserCount(true); 3982 m_sceneGraph.removeUserCount(true);
3830 } 3983 }
@@ -3840,9 +3993,12 @@ namespace OpenSim.Region.Framework.Scenes
3840 } 3993 }
3841 else 3994 else
3842 presence.ControllingClient.SendShutdownConnectionNotice(); 3995 presence.ControllingClient.SendShutdownConnectionNotice();
3996 presence.ControllingClient.Close(false);
3997 }
3998 else if (!childOnly)
3999 {
4000 presence.ControllingClient.Close(true);
3843 } 4001 }
3844
3845 presence.ControllingClient.Close();
3846 return true; 4002 return true;
3847 } 4003 }
3848 4004
@@ -4464,7 +4620,7 @@ namespace OpenSim.Region.Framework.Scenes
4464 // 4620 //
4465 int health=1; // Start at 1, means we're up 4621 int health=1; // Start at 1, means we're up
4466 4622
4467 if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000) 4623 if (m_firstHeartbeat || ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000))
4468 health+=1; 4624 health+=1;
4469 else 4625 else
4470 return health; 4626 return health;
@@ -4927,8 +5083,17 @@ namespace OpenSim.Region.Framework.Scenes
4927 { 5083 {
4928 float ominX, ominY, ominZ, omaxX, omaxY, omaxZ; 5084 float ominX, ominY, ominZ, omaxX, omaxY, omaxZ;
4929 5085
5086 Vector3 vec = g.AbsolutePosition;
5087
4930 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ); 5088 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ);
4931 5089
5090 ominX += vec.X;
5091 omaxX += vec.X;
5092 ominY += vec.Y;
5093 omaxY += vec.Y;
5094 ominZ += vec.Z;
5095 omaxZ += vec.Z;
5096
4932 if (minX > ominX) 5097 if (minX > ominX)
4933 minX = ominX; 5098 minX = ominX;
4934 if (minY > ominY) 5099 if (minY > ominY)
@@ -4998,10 +5163,15 @@ namespace OpenSim.Region.Framework.Scenes
4998 }); 5163 });
4999 } 5164 }
5000 5165
5001 foreach (SceneObjectGroup grp in objectsToDelete) 5166 if (objectsToDelete.Count > 0)
5002 { 5167 {
5003 m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); 5168 m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
5004 DeleteSceneObject(grp, true); 5169 foreach (SceneObjectGroup grp in objectsToDelete)
5170 {
5171 m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
5172 DeleteSceneObject(grp, true);
5173 }
5174 m_log.Debug("[SCENE]: Finished dropped attachment deletion");
5005 } 5175 }
5006 } 5176 }
5007 } 5177 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 88e084e..632646d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -44,8 +44,6 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
44 44
45namespace OpenSim.Region.Framework.Scenes 45namespace OpenSim.Region.Framework.Scenes
46{ 46{
47 public delegate void KiPrimitiveDelegate(uint localID);
48
49 public delegate void RemoveKnownRegionsFromAvatarList(UUID avatarID, List<ulong> regionlst); 47 public delegate void RemoveKnownRegionsFromAvatarList(UUID avatarID, List<ulong> regionlst);
50 48
51 /// <summary> 49 /// <summary>
@@ -113,8 +111,6 @@ namespace OpenSim.Region.Framework.Scenes
113// private LogOffUser handlerLogOffUser = null; 111// private LogOffUser handlerLogOffUser = null;
114// private GetLandData handlerGetLandData = null; // OnGetLandData 112// private GetLandData handlerGetLandData = null; // OnGetLandData
115 113
116 public KiPrimitiveDelegate KiPrimitive;
117
118 public SceneCommunicationService() 114 public SceneCommunicationService()
119 { 115 {
120 } 116 }
@@ -168,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
168 164
169 if (neighbour != null) 165 if (neighbour != null)
170 { 166 {
171 m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); 167 // m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
172 m_scene.EventManager.TriggerOnRegionUp(neighbour); 168 m_scene.EventManager.TriggerOnRegionUp(neighbour);
173 } 169 }
174 else 170 else
@@ -183,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes
183 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 179 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
184 180
185 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); 181 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
186 m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); 182 //m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
187 foreach (GridRegion n in neighbours) 183 foreach (GridRegion n in neighbours)
188 { 184 {
189 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; 185 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
@@ -267,14 +263,14 @@ namespace OpenSim.Region.Framework.Scenes
267 protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle) 263 protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
268 { 264 {
269 265
270 m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); 266 //m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle);
271 // let's do our best, but there's not much we can do if the neighbour doesn't accept. 267 // let's do our best, but there's not much we can do if the neighbour doesn't accept.
272 268
273 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); 269 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
274 uint x = 0, y = 0; 270 uint x = 0, y = 0;
275 Utils.LongToUInts(regionHandle, out x, out y); 271 Utils.LongToUInts(regionHandle, out x, out y);
276 GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); 272 GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
277 m_scene.SimulationService.CloseAgent(destination, agentID); 273 m_scene.SimulationService.CloseChildAgent(destination, agentID);
278 } 274 }
279 275
280 private void SendCloseChildAgentCompleted(IAsyncResult iar) 276 private void SendCloseChildAgentCompleted(IAsyncResult iar)
@@ -293,7 +289,7 @@ namespace OpenSim.Region.Framework.Scenes
293 d); 289 d);
294 } 290 }
295 } 291 }
296 292
297 public List<GridRegion> RequestNamedRegions(string name, int maxNumber) 293 public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
298 { 294 {
299 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 295 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 032c859..b2d9358 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -43,6 +43,12 @@ namespace OpenSim.Region.Framework.Scenes
43 43
44 public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone); 44 public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone);
45 45
46 public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
47
48 public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
49
50 public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
51
46 public delegate void ObjectCreateDelegate(EntityBase obj); 52 public delegate void ObjectCreateDelegate(EntityBase obj);
47 53
48 public delegate void ObjectDeleteDelegate(EntityBase obj); 54 public delegate void ObjectDeleteDelegate(EntityBase obj);
@@ -61,6 +67,9 @@ namespace OpenSim.Region.Framework.Scenes
61 private PhysicsCrash handlerPhysicsCrash = null; 67 private PhysicsCrash handlerPhysicsCrash = null;
62 68
63 public event ObjectDuplicateDelegate OnObjectDuplicate; 69 public event ObjectDuplicateDelegate OnObjectDuplicate;
70 public event AttachToBackupDelegate OnAttachToBackup;
71 public event DetachFromBackupDelegate OnDetachFromBackup;
72 public event ChangedBackupDelegate OnChangeBackup;
64 public event ObjectCreateDelegate OnObjectCreate; 73 public event ObjectCreateDelegate OnObjectCreate;
65 public event ObjectDeleteDelegate OnObjectRemove; 74 public event ObjectDeleteDelegate OnObjectRemove;
66 75
@@ -68,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
68 77
69 #region Fields 78 #region Fields
70 79
71 protected object m_presenceLock = new object(); 80 protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
72 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>(); 81 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>();
73 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>(); 82 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
74 83
@@ -124,13 +133,18 @@ namespace OpenSim.Region.Framework.Scenes
124 133
125 protected internal void Close() 134 protected internal void Close()
126 { 135 {
127 lock (m_presenceLock) 136 m_scenePresencesLock.EnterWriteLock();
137 try
128 { 138 {
129 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(); 139 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>();
130 List<ScenePresence> newlist = new List<ScenePresence>(); 140 List<ScenePresence> newlist = new List<ScenePresence>();
131 m_scenePresenceMap = newmap; 141 m_scenePresenceMap = newmap;
132 m_scenePresenceArray = newlist; 142 m_scenePresenceArray = newlist;
133 } 143 }
144 finally
145 {
146 m_scenePresencesLock.ExitWriteLock();
147 }
134 148
135 lock (SceneObjectGroupsByFullID) 149 lock (SceneObjectGroupsByFullID)
136 SceneObjectGroupsByFullID.Clear(); 150 SceneObjectGroupsByFullID.Clear();
@@ -209,27 +223,8 @@ namespace OpenSim.Region.Framework.Scenes
209 if (sp.IsChildAgent) 223 if (sp.IsChildAgent)
210 return; 224 return;
211 225
212 if (sp.ParentID != 0) 226 coarseLocations.Add(sp.AbsolutePosition);
213 { 227 avatarUUIDs.Add(sp.UUID);
214 // sitting avatar
215 SceneObjectPart sop = m_parentScene.GetSceneObjectPart(sp.ParentID);
216 if (sop != null)
217 {
218 coarseLocations.Add(sop.AbsolutePosition + sp.AbsolutePosition);
219 avatarUUIDs.Add(sp.UUID);
220 }
221 else
222 {
223 // we can't find the parent.. ! arg!
224 coarseLocations.Add(sp.AbsolutePosition);
225 avatarUUIDs.Add(sp.UUID);
226 }
227 }
228 else
229 {
230 coarseLocations.Add(sp.AbsolutePosition);
231 avatarUUIDs.Add(sp.UUID);
232 }
233 } 228 }
234 } 229 }
235 230
@@ -259,6 +254,33 @@ namespace OpenSim.Region.Framework.Scenes
259 protected internal bool AddRestoredSceneObject( 254 protected internal bool AddRestoredSceneObject(
260 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 255 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
261 { 256 {
257 if (!m_parentScene.CombineRegions)
258 {
259 // KF: Check for out-of-region, move inside and make static.
260 Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
261 sceneObject.RootPart.GroupPosition.Y,
262 sceneObject.RootPart.GroupPosition.Z);
263 if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
264 npos.X > Constants.RegionSize ||
265 npos.Y > Constants.RegionSize))
266 {
267 if (npos.X < 0.0) npos.X = 1.0f;
268 if (npos.Y < 0.0) npos.Y = 1.0f;
269 if (npos.Z < 0.0) npos.Z = 0.0f;
270 if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
271 if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
272
273 foreach (SceneObjectPart part in sceneObject.Parts)
274 {
275 part.GroupPosition = npos;
276 }
277 sceneObject.RootPart.Velocity = Vector3.Zero;
278 sceneObject.RootPart.AngularVelocity = Vector3.Zero;
279 sceneObject.RootPart.Acceleration = Vector3.Zero;
280 sceneObject.RootPart.Velocity = Vector3.Zero;
281 }
282 }
283
262 if (attachToBackup && (!alreadyPersisted)) 284 if (attachToBackup && (!alreadyPersisted))
263 { 285 {
264 sceneObject.ForceInventoryPersistence(); 286 sceneObject.ForceInventoryPersistence();
@@ -458,6 +480,30 @@ namespace OpenSim.Region.Framework.Scenes
458 m_updateList[obj.UUID] = obj; 480 m_updateList[obj.UUID] = obj;
459 } 481 }
460 482
483 public void FireAttachToBackup(SceneObjectGroup obj)
484 {
485 if (OnAttachToBackup != null)
486 {
487 OnAttachToBackup(obj);
488 }
489 }
490
491 public void FireDetachFromBackup(SceneObjectGroup obj)
492 {
493 if (OnDetachFromBackup != null)
494 {
495 OnDetachFromBackup(obj);
496 }
497 }
498
499 public void FireChangeBackup(SceneObjectGroup obj)
500 {
501 if (OnChangeBackup != null)
502 {
503 OnChangeBackup(obj);
504 }
505 }
506
461 /// <summary> 507 /// <summary>
462 /// Process all pending updates 508 /// Process all pending updates
463 /// </summary> 509 /// </summary>
@@ -592,7 +638,8 @@ namespace OpenSim.Region.Framework.Scenes
592 638
593 Entities[presence.UUID] = presence; 639 Entities[presence.UUID] = presence;
594 640
595 lock (m_presenceLock) 641 m_scenePresencesLock.EnterWriteLock();
642 try
596 { 643 {
597 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 644 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
598 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 645 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -616,6 +663,10 @@ namespace OpenSim.Region.Framework.Scenes
616 m_scenePresenceMap = newmap; 663 m_scenePresenceMap = newmap;
617 m_scenePresenceArray = newlist; 664 m_scenePresenceArray = newlist;
618 } 665 }
666 finally
667 {
668 m_scenePresencesLock.ExitWriteLock();
669 }
619 } 670 }
620 671
621 /// <summary> 672 /// <summary>
@@ -630,7 +681,8 @@ namespace OpenSim.Region.Framework.Scenes
630 agentID); 681 agentID);
631 } 682 }
632 683
633 lock (m_presenceLock) 684 m_scenePresencesLock.EnterWriteLock();
685 try
634 { 686 {
635 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 687 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
636 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 688 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -652,6 +704,10 @@ namespace OpenSim.Region.Framework.Scenes
652 m_log.WarnFormat("[SCENE]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); 704 m_log.WarnFormat("[SCENE]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
653 } 705 }
654 } 706 }
707 finally
708 {
709 m_scenePresencesLock.ExitWriteLock();
710 }
655 } 711 }
656 712
657 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F) 713 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -775,6 +831,11 @@ namespace OpenSim.Region.Framework.Scenes
775 return m_scenePresenceArray; 831 return m_scenePresenceArray;
776 } 832 }
777 833
834 public int GetNumberOfScenePresences()
835 {
836 return m_scenePresenceArray.Count;
837 }
838
778 /// <summary> 839 /// <summary>
779 /// Request a scene presence by UUID. Fast, indexed lookup. 840 /// Request a scene presence by UUID. Fast, indexed lookup.
780 /// </summary> 841 /// </summary>
@@ -1068,9 +1129,11 @@ namespace OpenSim.Region.Framework.Scenes
1068 /// <param name="action"></param> 1129 /// <param name="action"></param>
1069 protected internal void ForEachSOG(Action<SceneObjectGroup> action) 1130 protected internal void ForEachSOG(Action<SceneObjectGroup> action)
1070 { 1131 {
1071 List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values); 1132 EntityBase[] objlist = Entities.GetAllByType<SceneObjectGroup>();
1072 foreach (SceneObjectGroup obj in objlist) 1133 foreach (EntityBase ent in objlist)
1073 { 1134 {
1135 SceneObjectGroup obj = (SceneObjectGroup)ent;
1136
1074 try 1137 try
1075 { 1138 {
1076 action(obj); 1139 action(obj);
@@ -1531,10 +1594,13 @@ namespace OpenSim.Region.Framework.Scenes
1531 /// <param name="childPrims"></param> 1594 /// <param name="childPrims"></param>
1532 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children) 1595 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children)
1533 { 1596 {
1597 SceneObjectGroup parentGroup = root.ParentGroup;
1598 if (parentGroup == null) return;
1534 Monitor.Enter(m_updateLock); 1599 Monitor.Enter(m_updateLock);
1600
1535 try 1601 try
1536 { 1602 {
1537 SceneObjectGroup parentGroup = root.ParentGroup; 1603 parentGroup.areUpdatesSuspended = true;
1538 1604
1539 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); 1605 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
1540 if (parentGroup != null) 1606 if (parentGroup != null)
@@ -1546,11 +1612,6 @@ namespace OpenSim.Region.Framework.Scenes
1546 1612
1547 if (child != null) 1613 if (child != null)
1548 { 1614 {
1549 // Make sure no child prim is set for sale
1550 // So that, on delink, no prims are unwittingly
1551 // left for sale and sold off
1552 child.RootPart.ObjectSaleType = 0;
1553 child.RootPart.SalePrice = 10;
1554 childGroups.Add(child); 1615 childGroups.Add(child);
1555 } 1616 }
1556 } 1617 }
@@ -1573,12 +1634,12 @@ namespace OpenSim.Region.Framework.Scenes
1573 // occur on link to invoke this elsewhere (such as object selection) 1634 // occur on link to invoke this elsewhere (such as object selection)
1574 parentGroup.RootPart.CreateSelected = true; 1635 parentGroup.RootPart.CreateSelected = true;
1575 parentGroup.TriggerScriptChangedEvent(Changed.LINK); 1636 parentGroup.TriggerScriptChangedEvent(Changed.LINK);
1576 parentGroup.HasGroupChanged = true;
1577 parentGroup.ScheduleGroupForFullUpdate();
1578
1579 } 1637 }
1580 finally 1638 finally
1581 { 1639 {
1640 parentGroup.areUpdatesSuspended = false;
1641 parentGroup.HasGroupChanged = true;
1642 parentGroup.ScheduleGroupForFullUpdate();
1582 Monitor.Exit(m_updateLock); 1643 Monitor.Exit(m_updateLock);
1583 } 1644 }
1584 } 1645 }
@@ -1610,21 +1671,24 @@ namespace OpenSim.Region.Framework.Scenes
1610 1671
1611 SceneObjectGroup group = part.ParentGroup; 1672 SceneObjectGroup group = part.ParentGroup;
1612 if (!affectedGroups.Contains(group)) 1673 if (!affectedGroups.Contains(group))
1674 {
1675 group.areUpdatesSuspended = true;
1613 affectedGroups.Add(group); 1676 affectedGroups.Add(group);
1677 }
1614 } 1678 }
1615 } 1679 }
1616 } 1680 }
1617 1681
1618 foreach (SceneObjectPart child in childParts) 1682 if (childParts.Count > 0)
1619 { 1683 {
1620 // Unlink all child parts from their groups 1684 foreach (SceneObjectPart child in childParts)
1621 // 1685 {
1622 child.ParentGroup.DelinkFromGroup(child, true); 1686 // Unlink all child parts from their groups
1623 1687 //
1624 // These are not in affected groups and will not be 1688 child.ParentGroup.DelinkFromGroup(child, true);
1625 // handled further. Do the honors here. 1689 child.ParentGroup.HasGroupChanged = true;
1626 child.ParentGroup.HasGroupChanged = true; 1690 child.ParentGroup.ScheduleGroupForFullUpdate();
1627 child.ParentGroup.ScheduleGroupForFullUpdate(); 1691 }
1628 } 1692 }
1629 1693
1630 foreach (SceneObjectPart root in rootParts) 1694 foreach (SceneObjectPart root in rootParts)
@@ -1634,56 +1698,68 @@ namespace OpenSim.Region.Framework.Scenes
1634 // However, editing linked parts and unlinking may be different 1698 // However, editing linked parts and unlinking may be different
1635 // 1699 //
1636 SceneObjectGroup group = root.ParentGroup; 1700 SceneObjectGroup group = root.ParentGroup;
1701 group.areUpdatesSuspended = true;
1637 1702
1638 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); 1703 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
1639 int numChildren = newSet.Count; 1704 int numChildren = newSet.Count;
1640 1705
1706 if (numChildren == 1)
1707 break;
1708
1641 // If there are prims left in a link set, but the root is 1709 // If there are prims left in a link set, but the root is
1642 // slated for unlink, we need to do this 1710 // slated for unlink, we need to do this
1711 // Unlink the remaining set
1643 // 1712 //
1644 if (numChildren != 1) 1713 bool sendEventsToRemainder = true;
1645 { 1714 if (numChildren > 1)
1646 // Unlink the remaining set 1715 sendEventsToRemainder = false;
1647 //
1648 bool sendEventsToRemainder = true;
1649 if (numChildren > 1)
1650 sendEventsToRemainder = false;
1651 1716
1652 foreach (SceneObjectPart p in newSet) 1717 foreach (SceneObjectPart p in newSet)
1718 {
1719 if (p != group.RootPart)
1653 { 1720 {
1654 if (p != group.RootPart) 1721 group.DelinkFromGroup(p, sendEventsToRemainder);
1655 group.DelinkFromGroup(p, sendEventsToRemainder); 1722 if (numChildren > 2)
1723 {
1724 p.ParentGroup.areUpdatesSuspended = true;
1725 }
1726 else
1727 {
1728 p.ParentGroup.HasGroupChanged = true;
1729 p.ParentGroup.ScheduleGroupForFullUpdate();
1730 }
1656 } 1731 }
1732 }
1733
1734 // If there is more than one prim remaining, we
1735 // need to re-link
1736 //
1737 if (numChildren > 2)
1738 {
1739 // Remove old root
1740 //
1741 if (newSet.Contains(root))
1742 newSet.Remove(root);
1657 1743
1658 // If there is more than one prim remaining, we 1744 // Preserve link ordering
1659 // need to re-link
1660 // 1745 //
1661 if (numChildren > 2) 1746 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1662 { 1747 {
1663 // Remove old root 1748 return a.LinkNum.CompareTo(b.LinkNum);
1664 // 1749 });
1665 if (newSet.Contains(root))
1666 newSet.Remove(root);
1667
1668 // Preserve link ordering
1669 //
1670 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1671 {
1672 return a.LinkNum.CompareTo(b.LinkNum);
1673 });
1674 1750
1675 // Determine new root 1751 // Determine new root
1676 // 1752 //
1677 SceneObjectPart newRoot = newSet[0]; 1753 SceneObjectPart newRoot = newSet[0];
1678 newSet.RemoveAt(0); 1754 newSet.RemoveAt(0);
1679 1755
1680 foreach (SceneObjectPart newChild in newSet) 1756 foreach (SceneObjectPart newChild in newSet)
1681 newChild.UpdateFlag = 0; 1757 newChild.UpdateFlag = 0;
1682 1758
1683 LinkObjects(newRoot, newSet); 1759 newRoot.ParentGroup.areUpdatesSuspended = true;
1684 if (!affectedGroups.Contains(newRoot.ParentGroup)) 1760 LinkObjects(newRoot, newSet);
1685 affectedGroups.Add(newRoot.ParentGroup); 1761 if (!affectedGroups.Contains(newRoot.ParentGroup))
1686 } 1762 affectedGroups.Add(newRoot.ParentGroup);
1687 } 1763 }
1688 } 1764 }
1689 1765
@@ -1691,8 +1767,14 @@ namespace OpenSim.Region.Framework.Scenes
1691 // 1767 //
1692 foreach (SceneObjectGroup g in affectedGroups) 1768 foreach (SceneObjectGroup g in affectedGroups)
1693 { 1769 {
1770 // Child prims that have been unlinked and deleted will
1771 // return unless the root is deleted. This will remove them
1772 // from the database. They will be rewritten immediately,
1773 // minus the rows for the unlinked child prims.
1774 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
1694 g.TriggerScriptChangedEvent(Changed.LINK); 1775 g.TriggerScriptChangedEvent(Changed.LINK);
1695 g.HasGroupChanged = true; // Persist 1776 g.HasGroupChanged = true; // Persist
1777 g.areUpdatesSuspended = false;
1696 g.ScheduleGroupForFullUpdate(); 1778 g.ScheduleGroupForFullUpdate();
1697 } 1779 }
1698 } 1780 }
@@ -1807,9 +1889,6 @@ namespace OpenSim.Region.Framework.Scenes
1807 child.ApplyNextOwnerPermissions(); 1889 child.ApplyNextOwnerPermissions();
1808 } 1890 }
1809 } 1891 }
1810
1811 copy.RootPart.ObjectSaleType = 0;
1812 copy.RootPart.SalePrice = 10;
1813 } 1892 }
1814 1893
1815 Entities.Add(copy); 1894 Entities.Add(copy);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index a86223c..6cc7231 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -69,10 +69,6 @@ namespace OpenSim.Region.Framework.Scenes
69 /// <summary> 69 /// <summary>
70 /// Stop the scripts contained in all the prims in this group 70 /// Stop the scripts contained in all the prims in this group
71 /// </summary> 71 /// </summary>
72 /// <param name="sceneObjectBeingDeleted">
73 /// Should be true if these scripts are being removed because the scene
74 /// object is being deleted. This will prevent spurious updates to the client.
75 /// </param>
76 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 72 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
77 { 73 {
78 SceneObjectPart[] parts = m_parts.GetArray(); 74 SceneObjectPart[] parts = m_parts.GetArray();
@@ -419,6 +415,9 @@ namespace OpenSim.Region.Framework.Scenes
419 415
420 public void ResumeScripts() 416 public void ResumeScripts()
421 { 417 {
418 if (m_scene.RegionInfo.RegionSettings.DisableScripts)
419 return;
420
422 SceneObjectPart[] parts = m_parts.GetArray(); 421 SceneObjectPart[] parts = m_parts.GetArray();
423 for (int i = 0; i < parts.Length; i++) 422 for (int i = 0; i < parts.Length; i++)
424 parts[i].Inventory.ResumeScripts(); 423 parts[i].Inventory.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c2810b2..ee08072 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Diagnostics;
32using System.Linq; 33using System.Linq;
33using System.Threading; 34using System.Threading;
34using System.Xml; 35using System.Xml;
@@ -105,8 +106,29 @@ namespace OpenSim.Region.Framework.Scenes
105 /// since the group's last persistent backup 106 /// since the group's last persistent backup
106 /// </summary> 107 /// </summary>
107 private bool m_hasGroupChanged = false; 108 private bool m_hasGroupChanged = false;
108 private long timeFirstChanged; 109 private long timeFirstChanged = 0;
109 private long timeLastChanged; 110 private long timeLastChanged = 0;
111 private long m_maxPersistTime = 0;
112 private long m_minPersistTime = 0;
113 private Random m_rand;
114 private bool m_suspendUpdates;
115 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
116
117 public bool areUpdatesSuspended
118 {
119 get
120 {
121 return m_suspendUpdates;
122 }
123 set
124 {
125 m_suspendUpdates = value;
126 if (!value)
127 {
128 QueueForUpdateCheck();
129 }
130 }
131 }
110 132
111 public bool HasGroupChanged 133 public bool HasGroupChanged
112 { 134 {
@@ -114,9 +136,39 @@ namespace OpenSim.Region.Framework.Scenes
114 { 136 {
115 if (value) 137 if (value)
116 { 138 {
139 if (m_isBackedUp)
140 {
141 m_scene.SceneGraph.FireChangeBackup(this);
142 }
117 timeLastChanged = DateTime.Now.Ticks; 143 timeLastChanged = DateTime.Now.Ticks;
118 if (!m_hasGroupChanged) 144 if (!m_hasGroupChanged)
119 timeFirstChanged = DateTime.Now.Ticks; 145 timeFirstChanged = DateTime.Now.Ticks;
146 if (m_rootPart != null && m_rootPart.UUID != null && m_scene != null)
147 {
148 if (m_rand == null)
149 {
150 byte[] val = new byte[16];
151 m_rootPart.UUID.ToBytes(val, 0);
152 m_rand = new Random(BitConverter.ToInt32(val, 0));
153 }
154
155 if (m_scene.GetRootAgentCount() == 0)
156 {
157 //If the region is empty, this change has been made by an automated process
158 //and thus we delay the persist time by a random amount between 1.5 and 2.5.
159
160 float factor = 1.5f + (float)(m_rand.NextDouble());
161 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * factor);
162 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * factor);
163 }
164 else
165 {
166 //If the region is not empty, we want to obey the minimum and maximum persist times
167 //but add a random factor so we stagger the object persistance a little
168 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * (1.0d - (m_rand.NextDouble() / 5.0d))); //Multiply by 1.0-1.5
169 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * (1.0d + (m_rand.NextDouble() / 2.0d))); //Multiply by 0.8-1.0
170 }
171 }
120 } 172 }
121 m_hasGroupChanged = value; 173 m_hasGroupChanged = value;
122 } 174 }
@@ -132,8 +184,19 @@ namespace OpenSim.Region.Framework.Scenes
132 return false; 184 return false;
133 if (m_scene.ShuttingDown) 185 if (m_scene.ShuttingDown)
134 return true; 186 return true;
187
188 if (m_minPersistTime == 0 || m_maxPersistTime == 0)
189 {
190 m_maxPersistTime = m_scene.m_persistAfter;
191 m_minPersistTime = m_scene.m_dontPersistBefore;
192 }
193
135 long currentTime = DateTime.Now.Ticks; 194 long currentTime = DateTime.Now.Ticks;
136 if (currentTime - timeLastChanged > m_scene.m_dontPersistBefore || currentTime - timeFirstChanged > m_scene.m_persistAfter) 195
196 if (timeLastChanged == 0) timeLastChanged = currentTime;
197 if (timeFirstChanged == 0) timeFirstChanged = currentTime;
198
199 if (currentTime - timeLastChanged > m_minPersistTime || currentTime - timeFirstChanged > m_maxPersistTime)
137 return true; 200 return true;
138 return false; 201 return false;
139 } 202 }
@@ -176,10 +239,10 @@ namespace OpenSim.Region.Framework.Scenes
176 239
177 private bool m_scriptListens_atTarget; 240 private bool m_scriptListens_atTarget;
178 private bool m_scriptListens_notAtTarget; 241 private bool m_scriptListens_notAtTarget;
179
180 private bool m_scriptListens_atRotTarget; 242 private bool m_scriptListens_atRotTarget;
181 private bool m_scriptListens_notAtRotTarget; 243 private bool m_scriptListens_notAtRotTarget;
182 244
245 public bool m_dupeInProgress = false;
183 internal Dictionary<UUID, string> m_savedScriptState; 246 internal Dictionary<UUID, string> m_savedScriptState;
184 247
185 #region Properties 248 #region Properties
@@ -219,7 +282,13 @@ namespace OpenSim.Region.Framework.Scenes
219 public virtual Quaternion Rotation 282 public virtual Quaternion Rotation
220 { 283 {
221 get { return m_rotation; } 284 get { return m_rotation; }
222 set { m_rotation = value; } 285 set {
286 foreach(SceneObjectPart p in m_parts.GetArray())
287 {
288 p.StoreUndoState(UndoType.STATE_GROUP_ROTATION);
289 }
290 m_rotation = value;
291 }
223 } 292 }
224 293
225 public Quaternion GroupRotation 294 public Quaternion GroupRotation
@@ -293,7 +362,11 @@ namespace OpenSim.Region.Framework.Scenes
293 { 362 {
294 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 363 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
295 } 364 }
296 365
366 foreach (SceneObjectPart part in m_parts.GetArray())
367 {
368 part.IgnoreUndoUpdate = true;
369 }
297 if (RootPart.GetStatusSandbox()) 370 if (RootPart.GetStatusSandbox())
298 { 371 {
299 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 372 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -304,10 +377,31 @@ namespace OpenSim.Region.Framework.Scenes
304 return; 377 return;
305 } 378 }
306 } 379 }
307
308 SceneObjectPart[] parts = m_parts.GetArray(); 380 SceneObjectPart[] parts = m_parts.GetArray();
309 for (int i = 0; i < parts.Length; i++) 381 foreach (SceneObjectPart part in parts)
310 parts[i].GroupPosition = val; 382 {
383 part.IgnoreUndoUpdate = false;
384 part.StoreUndoState(UndoType.STATE_GROUP_POSITION);
385 part.GroupPosition = val;
386 if (!m_dupeInProgress)
387 {
388 part.TriggerScriptChangedEvent(Changed.POSITION);
389 }
390 }
391 if (!m_dupeInProgress)
392 {
393 foreach (ScenePresence av in m_linkedAvatars)
394 {
395 SceneObjectPart p;
396 if (m_parts.TryGetValue(av.LinkedPrim, out p))
397 {
398 Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
399 av.AbsolutePosition += offset;
400 av.ParentPosition = p.GetWorldPosition(); //ParentPosition gets cleared by AbsolutePosition
401 av.SendFullUpdateToAllClients();
402 }
403 }
404 }
311 405
312 //if (m_rootPart.PhysActor != null) 406 //if (m_rootPart.PhysActor != null)
313 //{ 407 //{
@@ -458,6 +552,7 @@ namespace OpenSim.Region.Framework.Scenes
458 /// </summary> 552 /// </summary>
459 public SceneObjectGroup() 553 public SceneObjectGroup()
460 { 554 {
555
461 } 556 }
462 557
463 /// <summary> 558 /// <summary>
@@ -474,7 +569,7 @@ namespace OpenSim.Region.Framework.Scenes
474 /// Constructor. This object is added to the scene later via AttachToScene() 569 /// Constructor. This object is added to the scene later via AttachToScene()
475 /// </summary> 570 /// </summary>
476 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 571 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
477 { 572 {
478 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero)); 573 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
479 } 574 }
480 575
@@ -522,6 +617,9 @@ namespace OpenSim.Region.Framework.Scenes
522 /// </summary> 617 /// </summary>
523 public virtual void AttachToBackup() 618 public virtual void AttachToBackup()
524 { 619 {
620 if (IsAttachment) return;
621 m_scene.SceneGraph.FireAttachToBackup(this);
622
525 if (InSceneBackup) 623 if (InSceneBackup)
526 { 624 {
527 //m_log.DebugFormat( 625 //m_log.DebugFormat(
@@ -637,9 +735,9 @@ namespace OpenSim.Region.Framework.Scenes
637 result.normal = inter.normal; 735 result.normal = inter.normal;
638 result.distance = inter.distance; 736 result.distance = inter.distance;
639 } 737 }
738
640 } 739 }
641 } 740 }
642
643 return result; 741 return result;
644 } 742 }
645 743
@@ -659,17 +757,19 @@ namespace OpenSim.Region.Framework.Scenes
659 minZ = 8192f; 757 minZ = 8192f;
660 758
661 SceneObjectPart[] parts = m_parts.GetArray(); 759 SceneObjectPart[] parts = m_parts.GetArray();
662 for (int i = 0; i < parts.Length; i++) 760 foreach (SceneObjectPart part in parts)
663 { 761 {
664 SceneObjectPart part = parts[i];
665
666 Vector3 worldPos = part.GetWorldPosition(); 762 Vector3 worldPos = part.GetWorldPosition();
667 Vector3 offset = worldPos - AbsolutePosition; 763 Vector3 offset = worldPos - AbsolutePosition;
668 Quaternion worldRot; 764 Quaternion worldRot;
669 if (part.ParentID == 0) 765 if (part.ParentID == 0)
766 {
670 worldRot = part.RotationOffset; 767 worldRot = part.RotationOffset;
768 }
671 else 769 else
770 {
672 worldRot = part.GetWorldRotation(); 771 worldRot = part.GetWorldRotation();
772 }
673 773
674 Vector3 frontTopLeft; 774 Vector3 frontTopLeft;
675 Vector3 frontTopRight; 775 Vector3 frontTopRight;
@@ -681,6 +781,8 @@ namespace OpenSim.Region.Framework.Scenes
681 Vector3 backBottomLeft; 781 Vector3 backBottomLeft;
682 Vector3 backBottomRight; 782 Vector3 backBottomRight;
683 783
784 // Vector3[] corners = new Vector3[8];
785
684 Vector3 orig = Vector3.Zero; 786 Vector3 orig = Vector3.Zero;
685 787
686 frontTopLeft.X = orig.X - (part.Scale.X / 2); 788 frontTopLeft.X = orig.X - (part.Scale.X / 2);
@@ -715,6 +817,38 @@ namespace OpenSim.Region.Framework.Scenes
715 backBottomRight.Y = orig.Y + (part.Scale.Y / 2); 817 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
716 backBottomRight.Z = orig.Z - (part.Scale.Z / 2); 818 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
717 819
820
821
822 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
823 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
824 //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
825 //m_log.InfoFormat("pre corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
826 //m_log.InfoFormat("pre corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
827 //m_log.InfoFormat("pre corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
828 //m_log.InfoFormat("pre corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
829 //m_log.InfoFormat("pre corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
830
831 //for (int i = 0; i < 8; i++)
832 //{
833 // corners[i] = corners[i] * worldRot;
834 // corners[i] += offset;
835
836 // if (corners[i].X > maxX)
837 // maxX = corners[i].X;
838 // if (corners[i].X < minX)
839 // minX = corners[i].X;
840
841 // if (corners[i].Y > maxY)
842 // maxY = corners[i].Y;
843 // if (corners[i].Y < minY)
844 // minY = corners[i].Y;
845
846 // if (corners[i].Z > maxZ)
847 // maxZ = corners[i].Y;
848 // if (corners[i].Z < minZ)
849 // minZ = corners[i].Z;
850 //}
851
718 frontTopLeft = frontTopLeft * worldRot; 852 frontTopLeft = frontTopLeft * worldRot;
719 frontTopRight = frontTopRight * worldRot; 853 frontTopRight = frontTopRight * worldRot;
720 frontBottomLeft = frontBottomLeft * worldRot; 854 frontBottomLeft = frontBottomLeft * worldRot;
@@ -736,6 +870,15 @@ namespace OpenSim.Region.Framework.Scenes
736 backTopLeft += offset; 870 backTopLeft += offset;
737 backTopRight += offset; 871 backTopRight += offset;
738 872
873 //m_log.InfoFormat("corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
874 //m_log.InfoFormat("corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
875 //m_log.InfoFormat("corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
876 //m_log.InfoFormat("corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
877 //m_log.InfoFormat("corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
878 //m_log.InfoFormat("corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
879 //m_log.InfoFormat("corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
880 //m_log.InfoFormat("corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
881
739 if (frontTopRight.X > maxX) 882 if (frontTopRight.X > maxX)
740 maxX = frontTopRight.X; 883 maxX = frontTopRight.X;
741 if (frontTopLeft.X > maxX) 884 if (frontTopLeft.X > maxX)
@@ -881,15 +1024,20 @@ namespace OpenSim.Region.Framework.Scenes
881 1024
882 public void SaveScriptedState(XmlTextWriter writer) 1025 public void SaveScriptedState(XmlTextWriter writer)
883 { 1026 {
1027 SaveScriptedState(writer, false);
1028 }
1029
1030 public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
1031 {
884 XmlDocument doc = new XmlDocument(); 1032 XmlDocument doc = new XmlDocument();
885 Dictionary<UUID,string> states = new Dictionary<UUID,string>(); 1033 Dictionary<UUID,string> states = new Dictionary<UUID,string>();
886 1034
887 SceneObjectPart[] parts = m_parts.GetArray(); 1035 SceneObjectPart[] parts = m_parts.GetArray();
888 for (int i = 0; i < parts.Length; i++) 1036 for (int i = 0; i < parts.Length; i++)
889 { 1037 {
890 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); 1038 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs);
891 foreach (KeyValuePair<UUID, string> kvp in pstates) 1039 foreach (KeyValuePair<UUID, string> kvp in pstates)
892 states.Add(kvp.Key, kvp.Value); 1040 states[kvp.Key] = kvp.Value;
893 } 1041 }
894 1042
895 if (states.Count > 0) 1043 if (states.Count > 0)
@@ -908,6 +1056,118 @@ namespace OpenSim.Region.Framework.Scenes
908 } 1056 }
909 } 1057 }
910 1058
1059 /// <summary>
1060 /// Add the avatar to this linkset (avatar is sat).
1061 /// </summary>
1062 /// <param name="agentID"></param>
1063 public void AddAvatar(UUID agentID)
1064 {
1065 ScenePresence presence;
1066 if (m_scene.TryGetScenePresence(agentID, out presence))
1067 {
1068 if (!m_linkedAvatars.Contains(presence))
1069 {
1070 m_linkedAvatars.Add(presence);
1071 }
1072 }
1073 }
1074
1075 /// <summary>
1076 /// Delete the avatar from this linkset (avatar is unsat).
1077 /// </summary>
1078 /// <param name="agentID"></param>
1079 public void DeleteAvatar(UUID agentID)
1080 {
1081 ScenePresence presence;
1082 if (m_scene.TryGetScenePresence(agentID, out presence))
1083 {
1084 if (m_linkedAvatars.Contains(presence))
1085 {
1086 m_linkedAvatars.Remove(presence);
1087 }
1088 }
1089 }
1090
1091 /// <summary>
1092 /// Returns the list of linked presences (avatars sat on this group)
1093 /// </summary>
1094 /// <param name="agentID"></param>
1095 public List<ScenePresence> GetLinkedAvatars()
1096 {
1097 return m_linkedAvatars;
1098 }
1099
1100 /// <summary>
1101 /// Attach this scene object to the given avatar.
1102 /// </summary>
1103 /// <param name="agentID"></param>
1104 /// <param name="attachmentpoint"></param>
1105 /// <param name="AttachOffset"></param>
1106 public void AttachToAgent(UUID agentID, uint attachmentpoint, Vector3 AttachOffset, bool silent)
1107 {
1108 ScenePresence avatar = m_scene.GetScenePresence(agentID);
1109 if (avatar != null)
1110 {
1111 // don't attach attachments to child agents
1112 if (avatar.IsChildAgent) return;
1113
1114// m_log.DebugFormat("[SOG]: Adding attachment {0} to avatar {1}", Name, avatar.Name);
1115
1116 DetachFromBackup();
1117
1118 // Remove from database and parcel prim count
1119 m_scene.DeleteFromStorage(UUID);
1120 m_scene.EventManager.TriggerParcelPrimCountTainted();
1121
1122 m_rootPart.AttachedAvatar = agentID;
1123
1124 //Anakin Lohner bug #3839
1125 lock (m_parts)
1126 {
1127 foreach (SceneObjectPart p in m_parts.GetArray())
1128 {
1129 p.AttachedAvatar = agentID;
1130 }
1131 }
1132
1133 if (m_rootPart.PhysActor != null)
1134 {
1135 m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor);
1136 m_rootPart.PhysActor = null;
1137 }
1138
1139 AbsolutePosition = AttachOffset;
1140 m_rootPart.AttachedPos = AttachOffset;
1141 m_rootPart.IsAttachment = true;
1142
1143 m_rootPart.SetParentLocalId(avatar.LocalId);
1144 SetAttachmentPoint(Convert.ToByte(attachmentpoint));
1145
1146 avatar.AddAttachment(this);
1147
1148 if (!silent)
1149 {
1150 // Killing it here will cause the client to deselect it
1151 // It then reappears on the avatar, deselected
1152 // through the full update below
1153 //
1154 if (IsSelected)
1155 {
1156 m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
1157 }
1158
1159 IsSelected = false; // fudge....
1160 ScheduleGroupForFullUpdate();
1161 }
1162 }
1163 else
1164 {
1165 m_log.WarnFormat(
1166 "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
1167 UUID, agentID, Scene.RegionInfo.RegionName);
1168 }
1169 }
1170
911 public byte GetAttachmentPoint() 1171 public byte GetAttachmentPoint()
912 { 1172 {
913 return m_rootPart.Shape.State; 1173 return m_rootPart.Shape.State;
@@ -1034,7 +1294,10 @@ namespace OpenSim.Region.Framework.Scenes
1034 public void AddPart(SceneObjectPart part) 1294 public void AddPart(SceneObjectPart part)
1035 { 1295 {
1036 part.SetParent(this); 1296 part.SetParent(this);
1037 part.LinkNum = m_parts.Add(part.UUID, part); 1297 m_parts.Add(part.UUID, part);
1298
1299 part.LinkNum = m_parts.Count;
1300
1038 if (part.LinkNum == 2 && RootPart != null) 1301 if (part.LinkNum == 2 && RootPart != null)
1039 RootPart.LinkNum = 1; 1302 RootPart.LinkNum = 1;
1040 } 1303 }
@@ -1118,7 +1381,7 @@ namespace OpenSim.Region.Framework.Scenes
1118 1381
1119 public virtual void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient) 1382 public virtual void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient)
1120 { 1383 {
1121 part.StoreUndoState(); 1384 part.StoreUndoState(UndoType.STATE_PRIM_ALL);
1122 part.OnGrab(offsetPos, remoteClient); 1385 part.OnGrab(offsetPos, remoteClient);
1123 } 1386 }
1124 1387
@@ -1138,6 +1401,11 @@ namespace OpenSim.Region.Framework.Scenes
1138 /// <param name="silent">If true then deletion is not broadcast to clients</param> 1401 /// <param name="silent">If true then deletion is not broadcast to clients</param>
1139 public void DeleteGroupFromScene(bool silent) 1402 public void DeleteGroupFromScene(bool silent)
1140 { 1403 {
1404 // We need to keep track of this state in case this group is still queued for backup.
1405 m_isDeleted = true;
1406
1407 DetachFromBackup();
1408
1141 SceneObjectPart[] parts = m_parts.GetArray(); 1409 SceneObjectPart[] parts = m_parts.GetArray();
1142 for (int i = 0; i < parts.Length; i++) 1410 for (int i = 0; i < parts.Length; i++)
1143 { 1411 {
@@ -1149,13 +1417,11 @@ namespace OpenSim.Region.Framework.Scenes
1149 avatar.StandUp(); 1417 avatar.StandUp();
1150 1418
1151 if (!silent) 1419 if (!silent)
1152 {
1153 part.UpdateFlag = 0; 1420 part.UpdateFlag = 0;
1154 if (part == m_rootPart)
1155 avatar.ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
1156 }
1157 }); 1421 });
1158 } 1422 }
1423
1424
1159 } 1425 }
1160 1426
1161 public void AddScriptLPS(int count) 1427 public void AddScriptLPS(int count)
@@ -1252,7 +1518,12 @@ namespace OpenSim.Region.Framework.Scenes
1252 1518
1253 public void SetOwnerId(UUID userId) 1519 public void SetOwnerId(UUID userId)
1254 { 1520 {
1255 ForEachPart(delegate(SceneObjectPart part) { part.OwnerID = userId; }); 1521 ForEachPart(delegate(SceneObjectPart part)
1522 {
1523
1524 part.OwnerID = userId;
1525
1526 });
1256 } 1527 }
1257 1528
1258 public void ForEachPart(Action<SceneObjectPart> whatToDo) 1529 public void ForEachPart(Action<SceneObjectPart> whatToDo)
@@ -1284,11 +1555,17 @@ namespace OpenSim.Region.Framework.Scenes
1284 return; 1555 return;
1285 } 1556 }
1286 1557
1558 if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1559 return;
1560
1287 // Since this is the top of the section of call stack for backing up a particular scene object, don't let 1561 // Since this is the top of the section of call stack for backing up a particular scene object, don't let
1288 // any exception propogate upwards. 1562 // any exception propogate upwards.
1289 try 1563 try
1290 { 1564 {
1291 if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart 1565 if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
1566 m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things
1567 m_scene.LoadingPrims) // Land may not be valid yet
1568
1292 { 1569 {
1293 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1570 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1294 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1571 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -1313,6 +1590,7 @@ namespace OpenSim.Region.Framework.Scenes
1313 } 1590 }
1314 } 1591 }
1315 } 1592 }
1593
1316 } 1594 }
1317 1595
1318 if (HasGroupChanged) 1596 if (HasGroupChanged)
@@ -1320,6 +1598,20 @@ namespace OpenSim.Region.Framework.Scenes
1320 // don't backup while it's selected or you're asking for changes mid stream. 1598 // don't backup while it's selected or you're asking for changes mid stream.
1321 if (isTimeToPersist() || forcedBackup) 1599 if (isTimeToPersist() || forcedBackup)
1322 { 1600 {
1601 if (m_rootPart.PhysActor != null &&
1602 (!m_rootPart.PhysActor.IsPhysical))
1603 {
1604 // Possible ghost prim
1605 if (m_rootPart.PhysActor.Position != m_rootPart.GroupPosition)
1606 {
1607 foreach (SceneObjectPart part in m_parts.GetArray())
1608 {
1609 // Re-set physics actor positions and
1610 // orientations
1611 part.GroupPosition = m_rootPart.GroupPosition;
1612 }
1613 }
1614 }
1323// m_log.DebugFormat( 1615// m_log.DebugFormat(
1324// "[SCENE]: Storing {0}, {1} in {2}", 1616// "[SCENE]: Storing {0}, {1} in {2}",
1325// Name, UUID, m_scene.RegionInfo.RegionName); 1617// Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1382,81 +1674,89 @@ namespace OpenSim.Region.Framework.Scenes
1382 /// <returns></returns> 1674 /// <returns></returns>
1383 public SceneObjectGroup Copy(bool userExposed) 1675 public SceneObjectGroup Copy(bool userExposed)
1384 { 1676 {
1385 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); 1677 SceneObjectGroup dupe;
1386 dupe.m_isBackedUp = false; 1678 try
1387 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); 1679 {
1388 1680 m_dupeInProgress = true;
1389 // Warning, The following code related to previousAttachmentStatus is needed so that clones of 1681 dupe = (SceneObjectGroup)MemberwiseClone();
1390 // attachments do not bordercross while they're being duplicated. This is hacktastic! 1682 dupe.m_isBackedUp = false;
1391 // Normally, setting AbsolutePosition will bordercross a prim if it's outside the region! 1683 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
1392 // unless IsAttachment is true!, so to prevent border crossing, we save it's attachment state
1393 // (which should be false anyway) set it as an Attachment and then set it's Absolute Position,
1394 // then restore it's attachment state
1395
1396 // This is only necessary when userExposed is false!
1397 1684
1398 bool previousAttachmentStatus = dupe.RootPart.IsAttachment; 1685 // Warning, The following code related to previousAttachmentStatus is needed so that clones of
1399 1686 // attachments do not bordercross while they're being duplicated. This is hacktastic!
1400 if (!userExposed) 1687 // Normally, setting AbsolutePosition will bordercross a prim if it's outside the region!
1401 dupe.RootPart.IsAttachment = true; 1688 // unless IsAttachment is true!, so to prevent border crossing, we save it's attachment state
1689 // (which should be false anyway) set it as an Attachment and then set it's Absolute Position,
1690 // then restore it's attachment state
1402 1691
1403 dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); 1692 // This is only necessary when userExposed is false!
1404 1693
1405 if (!userExposed) 1694 bool previousAttachmentStatus = dupe.RootPart.IsAttachment;
1406 {
1407 dupe.RootPart.IsAttachment = previousAttachmentStatus;
1408 }
1409 1695
1410 dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); 1696 if (!userExposed)
1411 dupe.m_rootPart.LinkNum = m_rootPart.LinkNum; 1697 dupe.RootPart.IsAttachment = true;
1412 1698
1413 if (userExposed) 1699 dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
1414 dupe.m_rootPart.TrimPermissions();
1415 1700
1416 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray()); 1701 if (!userExposed)
1417
1418 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
1419 { 1702 {
1420 return p1.LinkNum.CompareTo(p2.LinkNum); 1703 dupe.RootPart.IsAttachment = previousAttachmentStatus;
1421 } 1704 }
1422 );
1423 1705
1424 foreach (SceneObjectPart part in partList) 1706 dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
1425 { 1707 dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
1426 if (part.UUID != m_rootPart.UUID) 1708
1709 if (userExposed)
1710 dupe.m_rootPart.TrimPermissions();
1711
1712 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray());
1713
1714 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
1715 {
1716 return p1.LinkNum.CompareTo(p2.LinkNum);
1717 }
1718 );
1719
1720 foreach (SceneObjectPart part in partList)
1427 { 1721 {
1428 SceneObjectPart newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed); 1722 if (part.UUID != m_rootPart.UUID)
1429 newPart.LinkNum = part.LinkNum; 1723 {
1430 } 1724 SceneObjectPart newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
1431 1725
1432 // Need to duplicate the physics actor as well 1726 newPart.LinkNum = part.LinkNum;
1433 if (part.PhysActor != null && userExposed) 1727 }
1728
1729 // Need to duplicate the physics actor as well
1730 if (part.PhysActor != null && userExposed)
1731 {
1732 PrimitiveBaseShape pbs = part.Shape;
1733
1734 part.PhysActor
1735 = m_scene.PhysicsScene.AddPrimShape(
1736 string.Format("{0}/{1}", part.Name, part.UUID),
1737 pbs,
1738 part.AbsolutePosition,
1739 part.Scale,
1740 part.RotationOffset,
1741 part.PhysActor.IsPhysical);
1742
1743 part.PhysActor.LocalID = part.LocalId;
1744 part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
1745 }
1746 }
1747 if (userExposed)
1434 { 1748 {
1435 PrimitiveBaseShape pbs = part.Shape; 1749 dupe.UpdateParentIDs();
1436 1750 dupe.HasGroupChanged = true;
1437 part.PhysActor 1751 dupe.AttachToBackup();
1438 = m_scene.PhysicsScene.AddPrimShape( 1752
1439 string.Format("{0}/{1}", part.Name, part.UUID), 1753 ScheduleGroupForFullUpdate();
1440 pbs,
1441 part.AbsolutePosition,
1442 part.Scale,
1443 part.RotationOffset,
1444 part.PhysActor.IsPhysical);
1445
1446 part.PhysActor.LocalID = part.LocalId;
1447 part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
1448 } 1754 }
1449 } 1755 }
1450 1756 finally
1451 if (userExposed)
1452 { 1757 {
1453 dupe.UpdateParentIDs(); 1758 m_dupeInProgress = false;
1454 dupe.HasGroupChanged = true;
1455 dupe.AttachToBackup();
1456
1457 ScheduleGroupForFullUpdate();
1458 } 1759 }
1459
1460 return dupe; 1760 return dupe;
1461 } 1761 }
1462 1762
@@ -1647,13 +1947,40 @@ namespace OpenSim.Region.Framework.Scenes
1647 } 1947 }
1648 } 1948 }
1649 1949
1950 public void rotLookAt(Quaternion target, float strength, float damping)
1951 {
1952 SceneObjectPart rootpart = m_rootPart;
1953 if (rootpart != null)
1954 {
1955 if (IsAttachment)
1956 {
1957 /*
1958 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
1959 if (avatar != null)
1960 {
1961 Rotate the Av?
1962 } */
1963 }
1964 else
1965 {
1966 if (rootpart.PhysActor != null)
1967 { // APID must be implemented in your physics system for this to function.
1968 rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
1969 rootpart.PhysActor.APIDStrength = strength;
1970 rootpart.PhysActor.APIDDamping = damping;
1971 rootpart.PhysActor.APIDActive = true;
1972 }
1973 }
1974 }
1975 }
1976
1650 public void stopLookAt() 1977 public void stopLookAt()
1651 { 1978 {
1652 SceneObjectPart rootpart = m_rootPart; 1979 SceneObjectPart rootpart = m_rootPart;
1653 if (rootpart != null) 1980 if (rootpart != null)
1654 { 1981 {
1655 if (rootpart.PhysActor != null) 1982 if (rootpart.PhysActor != null)
1656 { 1983 { // APID must be implemented in your physics system for this to function.
1657 rootpart.PhysActor.APIDActive = false; 1984 rootpart.PhysActor.APIDActive = false;
1658 } 1985 }
1659 } 1986 }
@@ -1719,6 +2046,8 @@ namespace OpenSim.Region.Framework.Scenes
1719 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 2046 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1720 { 2047 {
1721 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); 2048 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
2049 newPart.SetParent(this);
2050
1722 AddPart(newPart); 2051 AddPart(newPart);
1723 2052
1724 SetPartAsNonRoot(newPart); 2053 SetPartAsNonRoot(newPart);
@@ -1865,11 +2194,11 @@ namespace OpenSim.Region.Framework.Scenes
1865 /// Immediately send a full update for this scene object. 2194 /// Immediately send a full update for this scene object.
1866 /// </summary> 2195 /// </summary>
1867 public void SendGroupFullUpdate() 2196 public void SendGroupFullUpdate()
1868 { 2197 {
1869 if (IsDeleted) 2198 if (IsDeleted)
1870 return; 2199 return;
1871 2200
1872// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2201// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
1873 2202
1874 RootPart.SendFullUpdateToAllClients(); 2203 RootPart.SendFullUpdateToAllClients();
1875 2204
@@ -2058,12 +2387,15 @@ namespace OpenSim.Region.Framework.Scenes
2058 part.LinkNum += objectGroup.PrimCount; 2387 part.LinkNum += objectGroup.PrimCount;
2059 } 2388 }
2060 } 2389 }
2390 }
2061 2391
2062 linkPart.LinkNum = 2; 2392 linkPart.LinkNum = 2;
2063 2393
2064 linkPart.SetParent(this); 2394 linkPart.SetParent(this);
2065 linkPart.CreateSelected = true; 2395 linkPart.CreateSelected = true;
2066 2396
2397 lock (m_parts.SyncRoot)
2398 {
2067 //if (linkPart.PhysActor != null) 2399 //if (linkPart.PhysActor != null)
2068 //{ 2400 //{
2069 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); 2401 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
@@ -2220,6 +2552,8 @@ namespace OpenSim.Region.Framework.Scenes
2220 /// <param name="objectGroup"></param> 2552 /// <param name="objectGroup"></param>
2221 public virtual void DetachFromBackup() 2553 public virtual void DetachFromBackup()
2222 { 2554 {
2555 m_scene.SceneGraph.FireDetachFromBackup(this);
2556
2223 if (m_isBackedUp) 2557 if (m_isBackedUp)
2224 m_scene.EventManager.OnBackup -= ProcessBackup; 2558 m_scene.EventManager.OnBackup -= ProcessBackup;
2225 2559
@@ -2524,6 +2858,17 @@ namespace OpenSim.Region.Framework.Scenes
2524 } 2858 }
2525 } 2859 }
2526 2860
2861
2862
2863 /// <summary>
2864 /// Gets the number of parts
2865 /// </summary>
2866 /// <returns></returns>
2867 public int GetPartCount()
2868 {
2869 return Parts.Count();
2870 }
2871
2527 /// <summary> 2872 /// <summary>
2528 /// Update the texture entry for this part 2873 /// Update the texture entry for this part
2529 /// </summary> 2874 /// </summary>
@@ -2585,11 +2930,9 @@ namespace OpenSim.Region.Framework.Scenes
2585 scale.Y = m_scene.m_maxNonphys; 2930 scale.Y = m_scene.m_maxNonphys;
2586 if (scale.Z > m_scene.m_maxNonphys) 2931 if (scale.Z > m_scene.m_maxNonphys)
2587 scale.Z = m_scene.m_maxNonphys; 2932 scale.Z = m_scene.m_maxNonphys;
2588
2589 SceneObjectPart part = GetChildPart(localID); 2933 SceneObjectPart part = GetChildPart(localID);
2590 if (part != null) 2934 if (part != null)
2591 { 2935 {
2592 part.Resize(scale);
2593 if (part.PhysActor != null) 2936 if (part.PhysActor != null)
2594 { 2937 {
2595 if (part.PhysActor.IsPhysical) 2938 if (part.PhysActor.IsPhysical)
@@ -2604,7 +2947,7 @@ namespace OpenSim.Region.Framework.Scenes
2604 part.PhysActor.Size = scale; 2947 part.PhysActor.Size = scale;
2605 m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor); 2948 m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor);
2606 } 2949 }
2607 //if (part.UUID != m_rootPart.UUID) 2950 part.Resize(scale);
2608 2951
2609 HasGroupChanged = true; 2952 HasGroupChanged = true;
2610 ScheduleGroupForFullUpdate(); 2953 ScheduleGroupForFullUpdate();
@@ -2626,7 +2969,6 @@ namespace OpenSim.Region.Framework.Scenes
2626 SceneObjectPart part = GetChildPart(localID); 2969 SceneObjectPart part = GetChildPart(localID);
2627 if (part != null) 2970 if (part != null)
2628 { 2971 {
2629 part.IgnoreUndoUpdate = true;
2630 if (scale.X > m_scene.m_maxNonphys) 2972 if (scale.X > m_scene.m_maxNonphys)
2631 scale.X = m_scene.m_maxNonphys; 2973 scale.X = m_scene.m_maxNonphys;
2632 if (scale.Y > m_scene.m_maxNonphys) 2974 if (scale.Y > m_scene.m_maxNonphys)
@@ -2663,7 +3005,7 @@ namespace OpenSim.Region.Framework.Scenes
2663 3005
2664 if (part.PhysActor != null && part.PhysActor.IsPhysical) 3006 if (part.PhysActor != null && part.PhysActor.IsPhysical)
2665 { 3007 {
2666 if (oldSize.X * x > m_scene.m_maxPhys) 3008 if (oldSize.X*x > m_scene.m_maxPhys)
2667 { 3009 {
2668 f = m_scene.m_maxPhys / oldSize.X; 3010 f = m_scene.m_maxPhys / oldSize.X;
2669 a = f / x; 3011 a = f / x;
@@ -2671,7 +3013,7 @@ namespace OpenSim.Region.Framework.Scenes
2671 y *= a; 3013 y *= a;
2672 z *= a; 3014 z *= a;
2673 } 3015 }
2674 if (oldSize.Y * y > m_scene.m_maxPhys) 3016 if (oldSize.Y*y > m_scene.m_maxPhys)
2675 { 3017 {
2676 f = m_scene.m_maxPhys / oldSize.Y; 3018 f = m_scene.m_maxPhys / oldSize.Y;
2677 a = f / y; 3019 a = f / y;
@@ -2679,7 +3021,7 @@ namespace OpenSim.Region.Framework.Scenes
2679 y *= a; 3021 y *= a;
2680 z *= a; 3022 z *= a;
2681 } 3023 }
2682 if (oldSize.Z * z > m_scene.m_maxPhys) 3024 if (oldSize.Z*z > m_scene.m_maxPhys)
2683 { 3025 {
2684 f = m_scene.m_maxPhys / oldSize.Z; 3026 f = m_scene.m_maxPhys / oldSize.Z;
2685 a = f / z; 3027 a = f / z;
@@ -2690,7 +3032,7 @@ namespace OpenSim.Region.Framework.Scenes
2690 } 3032 }
2691 else 3033 else
2692 { 3034 {
2693 if (oldSize.X * x > m_scene.m_maxNonphys) 3035 if (oldSize.X*x > m_scene.m_maxNonphys)
2694 { 3036 {
2695 f = m_scene.m_maxNonphys / oldSize.X; 3037 f = m_scene.m_maxNonphys / oldSize.X;
2696 a = f / x; 3038 a = f / x;
@@ -2698,7 +3040,7 @@ namespace OpenSim.Region.Framework.Scenes
2698 y *= a; 3040 y *= a;
2699 z *= a; 3041 z *= a;
2700 } 3042 }
2701 if (oldSize.Y * y > m_scene.m_maxNonphys) 3043 if (oldSize.Y*y > m_scene.m_maxNonphys)
2702 { 3044 {
2703 f = m_scene.m_maxNonphys / oldSize.Y; 3045 f = m_scene.m_maxNonphys / oldSize.Y;
2704 a = f / y; 3046 a = f / y;
@@ -2706,7 +3048,7 @@ namespace OpenSim.Region.Framework.Scenes
2706 y *= a; 3048 y *= a;
2707 z *= a; 3049 z *= a;
2708 } 3050 }
2709 if (oldSize.Z * z > m_scene.m_maxNonphys) 3051 if (oldSize.Z*z > m_scene.m_maxNonphys)
2710 { 3052 {
2711 f = m_scene.m_maxNonphys / oldSize.Z; 3053 f = m_scene.m_maxNonphys / oldSize.Z;
2712 a = f / z; 3054 a = f / z;
@@ -2716,7 +3058,6 @@ namespace OpenSim.Region.Framework.Scenes
2716 } 3058 }
2717 } 3059 }
2718 obPart.IgnoreUndoUpdate = false; 3060 obPart.IgnoreUndoUpdate = false;
2719 obPart.StoreUndoState();
2720 } 3061 }
2721 } 3062 }
2722 } 3063 }
@@ -2724,8 +3065,13 @@ namespace OpenSim.Region.Framework.Scenes
2724 Vector3 prevScale = part.Scale; 3065 Vector3 prevScale = part.Scale;
2725 prevScale.X *= x; 3066 prevScale.X *= x;
2726 prevScale.Y *= y; 3067 prevScale.Y *= y;
2727 prevScale.Z *= z; 3068 prevScale.Z *= z;;
3069
3070 part.IgnoreUndoUpdate = false;
3071 part.StoreUndoState(UndoType.STATE_GROUP_SCALE);
3072 part.IgnoreUndoUpdate = true;
2728 part.Resize(prevScale); 3073 part.Resize(prevScale);
3074 part.IgnoreUndoUpdate = false;
2729 3075
2730 parts = m_parts.GetArray(); 3076 parts = m_parts.GetArray();
2731 for (int i = 0; i < parts.Length; i++) 3077 for (int i = 0; i < parts.Length; i++)
@@ -2734,19 +3080,26 @@ namespace OpenSim.Region.Framework.Scenes
2734 obPart.IgnoreUndoUpdate = true; 3080 obPart.IgnoreUndoUpdate = true;
2735 if (obPart.UUID != m_rootPart.UUID) 3081 if (obPart.UUID != m_rootPart.UUID)
2736 { 3082 {
2737 Vector3 currentpos = new Vector3(obPart.OffsetPosition); 3083 if (obPart.UUID != m_rootPart.UUID)
2738 currentpos.X *= x; 3084 {
2739 currentpos.Y *= y; 3085 obPart.IgnoreUndoUpdate = false;
2740 currentpos.Z *= z; 3086 obPart.StoreUndoState(UndoType.STATE_GROUP_SCALE);
2741 Vector3 newSize = new Vector3(obPart.Scale); 3087 obPart.IgnoreUndoUpdate = true;
2742 newSize.X *= x; 3088
2743 newSize.Y *= y; 3089 Vector3 currentpos = new Vector3(obPart.OffsetPosition);
2744 newSize.Z *= z; 3090 currentpos.X *= x;
2745 obPart.Resize(newSize); 3091 currentpos.Y *= y;
2746 obPart.UpdateOffSet(currentpos); 3092 currentpos.Z *= z;
3093 Vector3 newSize = new Vector3(obPart.Scale);
3094 newSize.X *= x;
3095 newSize.Y *= y;
3096 newSize.Z *= z;
3097 obPart.Resize(newSize);
3098 obPart.UpdateOffSet(currentpos);
3099 }
3100 obPart.IgnoreUndoUpdate = false;
2747 } 3101 }
2748 obPart.IgnoreUndoUpdate = false; 3102 obPart.IgnoreUndoUpdate = false;
2749 obPart.StoreUndoState();
2750 } 3103 }
2751 3104
2752 if (part.PhysActor != null) 3105 if (part.PhysActor != null)
@@ -2756,7 +3109,6 @@ namespace OpenSim.Region.Framework.Scenes
2756 } 3109 }
2757 3110
2758 part.IgnoreUndoUpdate = false; 3111 part.IgnoreUndoUpdate = false;
2759 part.StoreUndoState();
2760 HasGroupChanged = true; 3112 HasGroupChanged = true;
2761 ScheduleGroupForTerseUpdate(); 3113 ScheduleGroupForTerseUpdate();
2762 } 3114 }
@@ -2772,14 +3124,11 @@ namespace OpenSim.Region.Framework.Scenes
2772 /// <param name="pos"></param> 3124 /// <param name="pos"></param>
2773 public void UpdateGroupPosition(Vector3 pos) 3125 public void UpdateGroupPosition(Vector3 pos)
2774 { 3126 {
2775 SceneObjectPart[] parts = m_parts.GetArray();
2776 for (int i = 0; i < parts.Length; i++)
2777 parts[i].StoreUndoState();
2778
2779 if (m_scene.EventManager.TriggerGroupMove(UUID, pos)) 3127 if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
2780 { 3128 {
2781 if (IsAttachment) 3129 if (IsAttachment)
2782 { 3130 {
3131 m_rootPart.StoreUndoState(UndoType.STATE_GROUP_POSITION);
2783 m_rootPart.AttachedPos = pos; 3132 m_rootPart.AttachedPos = pos;
2784 } 3133 }
2785 if (RootPart.GetStatusSandbox()) 3134 if (RootPart.GetStatusSandbox())
@@ -2813,7 +3162,7 @@ namespace OpenSim.Region.Framework.Scenes
2813 3162
2814 SceneObjectPart[] parts = m_parts.GetArray(); 3163 SceneObjectPart[] parts = m_parts.GetArray();
2815 for (int i = 0; i < parts.Length; i++) 3164 for (int i = 0; i < parts.Length; i++)
2816 parts[i].StoreUndoState(); 3165 parts[i].StoreUndoState(UndoType.STATE_PRIM_POSITION);
2817 3166
2818 if (part != null) 3167 if (part != null)
2819 { 3168 {
@@ -2838,7 +3187,7 @@ namespace OpenSim.Region.Framework.Scenes
2838 { 3187 {
2839 SceneObjectPart[] parts = m_parts.GetArray(); 3188 SceneObjectPart[] parts = m_parts.GetArray();
2840 for (int i = 0; i < parts.Length; i++) 3189 for (int i = 0; i < parts.Length; i++)
2841 parts[i].StoreUndoState(); 3190 parts[i].StoreUndoState(UndoType.STATE_PRIM_POSITION);
2842 3191
2843 Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z); 3192 Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
2844 Vector3 oldPos = 3193 Vector3 oldPos =
@@ -2859,10 +3208,27 @@ namespace OpenSim.Region.Framework.Scenes
2859 obPart.OffsetPosition = obPart.OffsetPosition + diff; 3208 obPart.OffsetPosition = obPart.OffsetPosition + diff;
2860 } 3209 }
2861 3210
2862 AbsolutePosition = newPos; 3211 //We have to set undoing here because otherwise an undo state will be saved
3212 if (!m_rootPart.Undoing)
3213 {
3214 m_rootPart.Undoing = true;
3215 AbsolutePosition = newPos;
3216 m_rootPart.Undoing = false;
3217 }
3218 else
3219 {
3220 AbsolutePosition = newPos;
3221 }
2863 3222
2864 HasGroupChanged = true; 3223 HasGroupChanged = true;
2865 ScheduleGroupForTerseUpdate(); 3224 if (m_rootPart.Undoing)
3225 {
3226 ScheduleGroupForFullUpdate();
3227 }
3228 else
3229 {
3230 ScheduleGroupForTerseUpdate();
3231 }
2866 } 3232 }
2867 3233
2868 public void OffsetForNewRegion(Vector3 offset) 3234 public void OffsetForNewRegion(Vector3 offset)
@@ -2882,7 +3248,7 @@ namespace OpenSim.Region.Framework.Scenes
2882 { 3248 {
2883 SceneObjectPart[] parts = m_parts.GetArray(); 3249 SceneObjectPart[] parts = m_parts.GetArray();
2884 for (int i = 0; i < parts.Length; i++) 3250 for (int i = 0; i < parts.Length; i++)
2885 parts[i].StoreUndoState(); 3251 parts[i].StoreUndoState(UndoType.STATE_GROUP_ROTATION);
2886 3252
2887 m_rootPart.UpdateRotation(rot); 3253 m_rootPart.UpdateRotation(rot);
2888 3254
@@ -2906,7 +3272,7 @@ namespace OpenSim.Region.Framework.Scenes
2906 { 3272 {
2907 SceneObjectPart[] parts = m_parts.GetArray(); 3273 SceneObjectPart[] parts = m_parts.GetArray();
2908 for (int i = 0; i < parts.Length; i++) 3274 for (int i = 0; i < parts.Length; i++)
2909 parts[i].StoreUndoState(); 3275 parts[i].StoreUndoState(UndoType.STATE_GROUP_ROTATION);
2910 3276
2911 m_rootPart.UpdateRotation(rot); 3277 m_rootPart.UpdateRotation(rot);
2912 3278
@@ -2931,10 +3297,9 @@ namespace OpenSim.Region.Framework.Scenes
2931 public void UpdateSingleRotation(Quaternion rot, uint localID) 3297 public void UpdateSingleRotation(Quaternion rot, uint localID)
2932 { 3298 {
2933 SceneObjectPart part = GetChildPart(localID); 3299 SceneObjectPart part = GetChildPart(localID);
2934
2935 SceneObjectPart[] parts = m_parts.GetArray(); 3300 SceneObjectPart[] parts = m_parts.GetArray();
2936 for (int i = 0; i < parts.Length; i++) 3301 for (int i = 0; i < parts.Length; i++)
2937 parts[i].StoreUndoState(); 3302 parts[i].StoreUndoState(UndoType.STATE_PRIM_ROTATION);
2938 3303
2939 if (part != null) 3304 if (part != null)
2940 { 3305 {
@@ -2962,15 +3327,24 @@ namespace OpenSim.Region.Framework.Scenes
2962 if (part.UUID == m_rootPart.UUID) 3327 if (part.UUID == m_rootPart.UUID)
2963 { 3328 {
2964 UpdateRootRotation(rot); 3329 UpdateRootRotation(rot);
2965 AbsolutePosition = pos; 3330 if (!m_rootPart.Undoing)
3331 {
3332 m_rootPart.Undoing = true;
3333 AbsolutePosition = pos;
3334 m_rootPart.Undoing = false;
3335 }
3336 else
3337 {
3338 AbsolutePosition = pos;
3339 }
2966 } 3340 }
2967 else 3341 else
2968 { 3342 {
3343 part.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
2969 part.IgnoreUndoUpdate = true; 3344 part.IgnoreUndoUpdate = true;
2970 part.UpdateRotation(rot); 3345 part.UpdateRotation(rot);
2971 part.OffsetPosition = pos; 3346 part.OffsetPosition = pos;
2972 part.IgnoreUndoUpdate = false; 3347 part.IgnoreUndoUpdate = false;
2973 part.StoreUndoState();
2974 } 3348 }
2975 } 3349 }
2976 } 3350 }
@@ -2984,7 +3358,13 @@ namespace OpenSim.Region.Framework.Scenes
2984 Quaternion axRot = rot; 3358 Quaternion axRot = rot;
2985 Quaternion oldParentRot = m_rootPart.RotationOffset; 3359 Quaternion oldParentRot = m_rootPart.RotationOffset;
2986 3360
2987 m_rootPart.StoreUndoState(); 3361 m_rootPart.StoreUndoState(UndoType.STATE_PRIM_ROTATION);
3362 bool cancelUndo = false;
3363 if (!m_rootPart.Undoing)
3364 {
3365 m_rootPart.Undoing = true;
3366 cancelUndo = true;
3367 }
2988 m_rootPart.UpdateRotation(rot); 3368 m_rootPart.UpdateRotation(rot);
2989 if (m_rootPart.PhysActor != null) 3369 if (m_rootPart.PhysActor != null)
2990 { 3370 {
@@ -3008,17 +3388,12 @@ namespace OpenSim.Region.Framework.Scenes
3008 newRot *= Quaternion.Inverse(axRot); 3388 newRot *= Quaternion.Inverse(axRot);
3009 prim.RotationOffset = newRot; 3389 prim.RotationOffset = newRot;
3010 prim.ScheduleTerseUpdate(); 3390 prim.ScheduleTerseUpdate();
3391 prim.IgnoreUndoUpdate = false;
3011 } 3392 }
3012 } 3393 }
3013 3394 if (cancelUndo == true)
3014 for (int i = 0; i < parts.Length; i++)
3015 { 3395 {
3016 SceneObjectPart childpart = parts[i]; 3396 m_rootPart.Undoing = false;
3017 if (childpart != m_rootPart)
3018 {
3019 childpart.IgnoreUndoUpdate = false;
3020 childpart.StoreUndoState();
3021 }
3022 } 3397 }
3023 3398
3024 m_rootPart.ScheduleTerseUpdate(); 3399 m_rootPart.ScheduleTerseUpdate();
@@ -3244,7 +3619,6 @@ namespace OpenSim.Region.Framework.Scenes
3244 public float GetMass() 3619 public float GetMass()
3245 { 3620 {
3246 float retmass = 0f; 3621 float retmass = 0f;
3247
3248 SceneObjectPart[] parts = m_parts.GetArray(); 3622 SceneObjectPart[] parts = m_parts.GetArray();
3249 for (int i = 0; i < parts.Length; i++) 3623 for (int i = 0; i < parts.Length; i++)
3250 retmass += parts[i].GetMass(); 3624 retmass += parts[i].GetMass();
@@ -3360,6 +3734,14 @@ namespace OpenSim.Region.Framework.Scenes
3360 SetFromItemID(uuid); 3734 SetFromItemID(uuid);
3361 } 3735 }
3362 3736
3737 public void ResetOwnerChangeFlag()
3738 {
3739 ForEachPart(delegate(SceneObjectPart part)
3740 {
3741 part.ResetOwnerChangeFlag();
3742 });
3743 }
3744
3363 #endregion 3745 #endregion
3364 } 3746 }
3365} 3747}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2155e26..f69a30c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -61,7 +61,8 @@ namespace OpenSim.Region.Framework.Scenes
61 TELEPORT = 512, 61 TELEPORT = 512,
62 REGION_RESTART = 1024, 62 REGION_RESTART = 1024,
63 MEDIA = 2048, 63 MEDIA = 2048,
64 ANIMATION = 16384 64 ANIMATION = 16384,
65 POSITION = 32768
65 } 66 }
66 67
67 // I don't really know where to put this except here. 68 // I don't really know where to put this except here.
@@ -145,10 +146,10 @@ namespace OpenSim.Region.Framework.Scenes
145 public Vector3 StatusSandboxPos; 146 public Vector3 StatusSandboxPos;
146 147
147 // TODO: This needs to be persisted in next XML version update! 148 // TODO: This needs to be persisted in next XML version update!
148 149 [XmlIgnore]
149 public readonly int[] PayPrice = {-2,-2,-2,-2,-2}; 150 public int[] PayPrice = {-2,-2,-2,-2,-2};
150 151
151 152 [XmlIgnore]
152 public PhysicsActor PhysActor 153 public PhysicsActor PhysActor
153 { 154 {
154 get { return m_physActor; } 155 get { return m_physActor; }
@@ -190,7 +191,15 @@ namespace OpenSim.Region.Framework.Scenes
190 191
191 public UUID FromFolderID; 192 public UUID FromFolderID;
192 193
193 194 // The following two are to hold the attachment data
195 // while an object is inworld
196 [XmlIgnore]
197 public byte AttachPoint = 0;
198
199 [XmlIgnore]
200 public Vector3 AttachOffset = Vector3.Zero;
201
202 [XmlIgnore]
194 public int STATUS_ROTATE_X; 203 public int STATUS_ROTATE_X;
195 204
196 205
@@ -285,6 +294,7 @@ namespace OpenSim.Region.Framework.Scenes
285 private Quaternion m_sitTargetOrientation = Quaternion.Identity; 294 private Quaternion m_sitTargetOrientation = Quaternion.Identity;
286 private Vector3 m_sitTargetPosition; 295 private Vector3 m_sitTargetPosition;
287 private string m_sitAnimation = "SIT"; 296 private string m_sitAnimation = "SIT";
297 private bool m_occupied; // KF if any av is sitting on this prim
288 private string m_text = String.Empty; 298 private string m_text = String.Empty;
289 private string m_touchName = String.Empty; 299 private string m_touchName = String.Empty;
290 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5); 300 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
@@ -374,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes
374 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 384 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
375 Quaternion rotationOffset, Vector3 offsetPosition) 385 Quaternion rotationOffset, Vector3 offsetPosition)
376 { 386 {
377 m_name = "Primitive"; 387 m_name = "Object";
378 388
379 Rezzed = DateTime.UtcNow; 389 Rezzed = DateTime.UtcNow;
380 _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed); 390 _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
@@ -430,7 +440,7 @@ namespace OpenSim.Region.Framework.Scenes
430 private uint _ownerMask = (uint)PermissionMask.All; 440 private uint _ownerMask = (uint)PermissionMask.All;
431 private uint _groupMask = (uint)PermissionMask.None; 441 private uint _groupMask = (uint)PermissionMask.None;
432 private uint _everyoneMask = (uint)PermissionMask.None; 442 private uint _everyoneMask = (uint)PermissionMask.None;
433 private uint _nextOwnerMask = (uint)PermissionMask.All; 443 private uint _nextOwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer);
434 private PrimFlags _flags = PrimFlags.None; 444 private PrimFlags _flags = PrimFlags.None;
435 private DateTime m_expires; 445 private DateTime m_expires;
436 private DateTime m_rezzed; 446 private DateTime m_rezzed;
@@ -526,12 +536,16 @@ namespace OpenSim.Region.Framework.Scenes
526 } 536 }
527 537
528 /// <value> 538 /// <value>
529 /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes 539 /// Get the inventory list
530 /// </value> 540 /// </value>
531 public TaskInventoryDictionary TaskInventory 541 public TaskInventoryDictionary TaskInventory
532 { 542 {
533 get { return m_inventory.Items; } 543 get {
534 set { m_inventory.Items = value; } 544 return m_inventory.Items;
545 }
546 set {
547 m_inventory.Items = value;
548 }
535 } 549 }
536 550
537 /// <summary> 551 /// <summary>
@@ -671,14 +685,12 @@ namespace OpenSim.Region.Framework.Scenes
671 set { m_LoopSoundSlavePrims = value; } 685 set { m_LoopSoundSlavePrims = value; }
672 } 686 }
673 687
674
675 public Byte[] TextureAnimation 688 public Byte[] TextureAnimation
676 { 689 {
677 get { return m_TextureAnimation; } 690 get { return m_TextureAnimation; }
678 set { m_TextureAnimation = value; } 691 set { m_TextureAnimation = value; }
679 } 692 }
680 693
681
682 public Byte[] ParticleSystem 694 public Byte[] ParticleSystem
683 { 695 {
684 get { return m_particleSystem; } 696 get { return m_particleSystem; }
@@ -732,7 +744,6 @@ namespace OpenSim.Region.Framework.Scenes
732 set 744 set
733 { 745 {
734 m_groupPosition = value; 746 m_groupPosition = value;
735
736 PhysicsActor actor = PhysActor; 747 PhysicsActor actor = PhysActor;
737 if (actor != null) 748 if (actor != null)
738 { 749 {
@@ -752,25 +763,13 @@ namespace OpenSim.Region.Framework.Scenes
752 763
753 // Tell the physics engines that this prim changed. 764 // Tell the physics engines that this prim changed.
754 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 765 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
766
755 } 767 }
756 catch (Exception e) 768 catch (Exception e)
757 { 769 {
758 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message); 770 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message);
759 } 771 }
760 } 772 }
761
762 // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
763 if (m_sitTargetAvatar != UUID.Zero)
764 {
765 if (m_parentGroup != null) // TODO can there be a SOP without a SOG?
766 {
767 ScenePresence avatar;
768 if (m_parentGroup.Scene.TryGetScenePresence(m_sitTargetAvatar, out avatar))
769 {
770 avatar.ParentPosition = GetWorldPosition();
771 }
772 }
773 }
774 } 773 }
775 } 774 }
776 775
@@ -779,7 +778,8 @@ namespace OpenSim.Region.Framework.Scenes
779 get { return m_offsetPosition; } 778 get { return m_offsetPosition; }
780 set 779 set
781 { 780 {
782 StoreUndoState(); 781 Vector3 oldpos = m_offsetPosition;
782 StoreUndoState(UndoType.STATE_PRIM_POSITION);
783 m_offsetPosition = value; 783 m_offsetPosition = value;
784 784
785 if (ParentGroup != null && !ParentGroup.IsDeleted) 785 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -793,7 +793,22 @@ namespace OpenSim.Region.Framework.Scenes
793 // Tell the physics engines that this prim changed. 793 // Tell the physics engines that this prim changed.
794 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 794 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
795 } 795 }
796
797 if (!m_parentGroup.m_dupeInProgress)
798 {
799 List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
800 foreach (ScenePresence av in avs)
801 {
802 if (av.LinkedPrim == m_uuid)
803 {
804 Vector3 offset = (m_offsetPosition - oldpos);
805 av.OffsetPosition += offset;
806 av.SendFullUpdateToAllClients();
807 }
808 }
809 }
796 } 810 }
811 TriggerScriptChangedEvent(Changed.POSITION);
797 } 812 }
798 } 813 }
799 814
@@ -835,7 +850,7 @@ namespace OpenSim.Region.Framework.Scenes
835 850
836 set 851 set
837 { 852 {
838 StoreUndoState(); 853 StoreUndoState(UndoType.STATE_PRIM_ROTATION);
839 m_rotationOffset = value; 854 m_rotationOffset = value;
840 855
841 PhysicsActor actor = PhysActor; 856 PhysicsActor actor = PhysActor;
@@ -919,7 +934,16 @@ namespace OpenSim.Region.Framework.Scenes
919 /// <summary></summary> 934 /// <summary></summary>
920 public Vector3 Acceleration 935 public Vector3 Acceleration
921 { 936 {
922 get { return m_acceleration; } 937 get
938 {
939 PhysicsActor actor = PhysActor;
940 if (actor != null)
941 {
942 m_acceleration = actor.Acceleration;
943 }
944 return m_acceleration;
945 }
946
923 set { m_acceleration = value; } 947 set { m_acceleration = value; }
924 } 948 }
925 949
@@ -1024,7 +1048,7 @@ namespace OpenSim.Region.Framework.Scenes
1024 get { return m_shape.Scale; } 1048 get { return m_shape.Scale; }
1025 set 1049 set
1026 { 1050 {
1027 StoreUndoState(); 1051 StoreUndoState(UndoType.STATE_PRIM_SCALE);
1028 if (m_shape != null) 1052 if (m_shape != null)
1029 { 1053 {
1030 m_shape.Scale = value; 1054 m_shape.Scale = value;
@@ -1092,9 +1116,10 @@ namespace OpenSim.Region.Framework.Scenes
1092 { 1116 {
1093 get { 1117 get {
1094 if (IsAttachment) 1118 if (IsAttachment)
1095 return GroupPosition; 1119 return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
1096 1120
1097 return m_offsetPosition + m_groupPosition; } 1121// return m_offsetPosition + m_groupPosition; }
1122 return m_groupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset) ; } //KF: Rotation was ignored!
1098 } 1123 }
1099 1124
1100 public SceneObjectGroup ParentGroup 1125 public SceneObjectGroup ParentGroup
@@ -1253,6 +1278,13 @@ namespace OpenSim.Region.Framework.Scenes
1253 _flags = value; 1278 _flags = value;
1254 } 1279 }
1255 } 1280 }
1281
1282 [XmlIgnore]
1283 public bool IsOccupied // KF If an av is sittingon this prim
1284 {
1285 get { return m_occupied; }
1286 set { m_occupied = value; }
1287 }
1256 1288
1257 1289
1258 public UUID SitTargetAvatar 1290 public UUID SitTargetAvatar
@@ -1328,14 +1360,6 @@ namespace OpenSim.Region.Framework.Scenes
1328 } 1360 }
1329 } 1361 }
1330 1362
1331 /// <summary>
1332 /// Clear all pending updates of parts to clients
1333 /// </summary>
1334 private void ClearUpdateSchedule()
1335 {
1336 m_updateFlag = 0;
1337 }
1338
1339 private void SendObjectPropertiesToClient(UUID AgentID) 1363 private void SendObjectPropertiesToClient(UUID AgentID)
1340 { 1364 {
1341 m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar) 1365 m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
@@ -1586,14 +1610,21 @@ namespace OpenSim.Region.Framework.Scenes
1586 // or flexible 1610 // or flexible
1587 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible)) 1611 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
1588 { 1612 {
1589 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 1613 try
1590 string.Format("{0}/{1}", Name, UUID), 1614 {
1591 Shape, 1615 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
1592 AbsolutePosition, 1616 string.Format("{0}/{1}", Name, UUID),
1593 Scale, 1617 Shape,
1594 RotationOffset, 1618 AbsolutePosition,
1595 RigidBody); 1619 Scale,
1596 1620 RotationOffset,
1621 RigidBody);
1622 }
1623 catch
1624 {
1625 m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid);
1626 PhysActor = null;
1627 }
1597 // Basic Physics returns null.. joy joy joy. 1628 // Basic Physics returns null.. joy joy joy.
1598 if (PhysActor != null) 1629 if (PhysActor != null)
1599 { 1630 {
@@ -1621,7 +1652,7 @@ namespace OpenSim.Region.Framework.Scenes
1621 { 1652 {
1622 m_redo.Clear(); 1653 m_redo.Clear();
1623 } 1654 }
1624 StoreUndoState(); 1655 StoreUndoState(UndoType.STATE_ALL);
1625 } 1656 }
1626 1657
1627 public byte ConvertScriptUintToByte(uint indata) 1658 public byte ConvertScriptUintToByte(uint indata)
@@ -1690,6 +1721,9 @@ namespace OpenSim.Region.Framework.Scenes
1690 1721
1691 // Move afterwards ResetIDs as it clears the localID 1722 // Move afterwards ResetIDs as it clears the localID
1692 dupe.LocalId = localID; 1723 dupe.LocalId = localID;
1724 if(dupe.PhysActor != null)
1725 dupe.PhysActor.LocalID = localID;
1726
1693 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 1727 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
1694 dupe._lastOwnerID = OwnerID; 1728 dupe._lastOwnerID = OwnerID;
1695 1729
@@ -1733,7 +1767,7 @@ namespace OpenSim.Region.Framework.Scenes
1733 PrimitiveBaseShape shape = PrimitiveBaseShape.Create(); 1767 PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
1734 part.Shape = shape; 1768 part.Shape = shape;
1735 1769
1736 part.Name = "Primitive"; 1770 part.Name = "Object";
1737 part._ownerID = UUID.Random(); 1771 part._ownerID = UUID.Random();
1738 1772
1739 return part; 1773 return part;
@@ -2093,12 +2127,17 @@ namespace OpenSim.Region.Framework.Scenes
2093 public Vector3 GetWorldPosition() 2127 public Vector3 GetWorldPosition()
2094 { 2128 {
2095 Quaternion parentRot = ParentGroup.RootPart.RotationOffset; 2129 Quaternion parentRot = ParentGroup.RootPart.RotationOffset;
2096
2097 Vector3 axPos = OffsetPosition; 2130 Vector3 axPos = OffsetPosition;
2098
2099 axPos *= parentRot; 2131 axPos *= parentRot;
2100 Vector3 translationOffsetPosition = axPos; 2132 Vector3 translationOffsetPosition = axPos;
2101 return GroupPosition + translationOffsetPosition; 2133 if(_parentID == 0)
2134 {
2135 return GroupPosition;
2136 }
2137 else
2138 {
2139 return ParentGroup.AbsolutePosition + translationOffsetPosition; //KF: Fix child prim position
2140 }
2102 } 2141 }
2103 2142
2104 /// <summary> 2143 /// <summary>
@@ -2109,7 +2148,7 @@ namespace OpenSim.Region.Framework.Scenes
2109 { 2148 {
2110 Quaternion newRot; 2149 Quaternion newRot;
2111 2150
2112 if (this.LinkNum == 0) 2151 if (this.LinkNum < 2) //KF Single or root prim
2113 { 2152 {
2114 newRot = RotationOffset; 2153 newRot = RotationOffset;
2115 } 2154 }
@@ -2755,17 +2794,18 @@ namespace OpenSim.Region.Framework.Scenes
2755 //Trys to fetch sound id from prim's inventory. 2794 //Trys to fetch sound id from prim's inventory.
2756 //Prim's inventory doesn't support non script items yet 2795 //Prim's inventory doesn't support non script items yet
2757 2796
2758 lock (TaskInventory) 2797 TaskInventory.LockItemsForRead(true);
2798
2799 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2759 { 2800 {
2760 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2801 if (item.Value.Name == sound)
2761 { 2802 {
2762 if (item.Value.Name == sound) 2803 soundID = item.Value.ItemID;
2763 { 2804 break;
2764 soundID = item.Value.ItemID;
2765 break;
2766 }
2767 } 2805 }
2768 } 2806 }
2807
2808 TaskInventory.LockItemsForRead(false);
2769 } 2809 }
2770 2810
2771 m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) 2811 m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
@@ -2825,7 +2865,7 @@ namespace OpenSim.Region.Framework.Scenes
2825 /// <param name="scale"></param> 2865 /// <param name="scale"></param>
2826 public void Resize(Vector3 scale) 2866 public void Resize(Vector3 scale)
2827 { 2867 {
2828 StoreUndoState(); 2868 StoreUndoState(UndoType.STATE_PRIM_SCALE);
2829 m_shape.Scale = scale; 2869 m_shape.Scale = scale;
2830 2870
2831 ParentGroup.HasGroupChanged = true; 2871 ParentGroup.HasGroupChanged = true;
@@ -2834,38 +2874,7 @@ namespace OpenSim.Region.Framework.Scenes
2834 2874
2835 public void RotLookAt(Quaternion target, float strength, float damping) 2875 public void RotLookAt(Quaternion target, float strength, float damping)
2836 { 2876 {
2837 rotLookAt(target, strength, damping); 2877 m_parentGroup.rotLookAt(target, strength, damping); // This calls method in SceneObjectGroup.
2838 }
2839
2840 public void rotLookAt(Quaternion target, float strength, float damping)
2841 {
2842 if (IsAttachment)
2843 {
2844 /*
2845 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
2846 if (avatar != null)
2847 {
2848 Rotate the Av?
2849 } */
2850 }
2851 else
2852 {
2853 APIDDamp = damping;
2854 APIDStrength = strength;
2855 APIDTarget = target;
2856 }
2857 }
2858
2859 public void startLookAt(Quaternion rot, float damp, float strength)
2860 {
2861 APIDDamp = damp;
2862 APIDStrength = strength;
2863 APIDTarget = rot;
2864 }
2865
2866 public void stopLookAt()
2867 {
2868 APIDTarget = Quaternion.Identity;
2869 } 2878 }
2870 2879
2871 /// <summary> 2880 /// <summary>
@@ -2877,7 +2886,10 @@ namespace OpenSim.Region.Framework.Scenes
2877 2886
2878 if (m_parentGroup != null) 2887 if (m_parentGroup != null)
2879 { 2888 {
2880 m_parentGroup.QueueForUpdateCheck(); 2889 if (!m_parentGroup.areUpdatesSuspended)
2890 {
2891 m_parentGroup.QueueForUpdateCheck();
2892 }
2881 } 2893 }
2882 2894
2883 int timeNow = Util.UnixTimeSinceEpoch(); 2895 int timeNow = Util.UnixTimeSinceEpoch();
@@ -3094,8 +3106,8 @@ namespace OpenSim.Region.Framework.Scenes
3094 { 3106 {
3095 const float ROTATION_TOLERANCE = 0.01f; 3107 const float ROTATION_TOLERANCE = 0.01f;
3096 const float VELOCITY_TOLERANCE = 0.001f; 3108 const float VELOCITY_TOLERANCE = 0.001f;
3097 const float POSITION_TOLERANCE = 0.05f; 3109 const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
3098 const int TIME_MS_TOLERANCE = 3000; 3110 const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
3099 3111
3100 if (m_updateFlag == 1) 3112 if (m_updateFlag == 1)
3101 { 3113 {
@@ -3109,7 +3121,7 @@ namespace OpenSim.Region.Framework.Scenes
3109 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) 3121 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
3110 { 3122 {
3111 AddTerseUpdateToAllAvatars(); 3123 AddTerseUpdateToAllAvatars();
3112 ClearUpdateSchedule(); 3124
3113 3125
3114 // This causes the Scene to 'poll' physical objects every couple of frames 3126 // This causes the Scene to 'poll' physical objects every couple of frames
3115 // bad, so it's been replaced by an event driven method. 3127 // bad, so it's been replaced by an event driven method.
@@ -3127,16 +3139,18 @@ namespace OpenSim.Region.Framework.Scenes
3127 m_lastAngularVelocity = AngularVelocity; 3139 m_lastAngularVelocity = AngularVelocity;
3128 m_lastTerseSent = Environment.TickCount; 3140 m_lastTerseSent = Environment.TickCount;
3129 } 3141 }
3142 //Moved this outside of the if clause so updates don't get blocked.. *sigh*
3143 m_updateFlag = 0; //Why were we calling a function to do this? Inefficient! *screams*
3130 } 3144 }
3131 else 3145 else
3132 { 3146 {
3133 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 3147 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
3134 { 3148 {
3135 AddFullUpdateToAllAvatars(); 3149 AddFullUpdateToAllAvatars();
3136 ClearUpdateSchedule(); 3150 m_updateFlag = 0; //Same here
3137 } 3151 }
3138 } 3152 }
3139 ClearUpdateSchedule(); 3153 m_updateFlag = 0;
3140 } 3154 }
3141 3155
3142 /// <summary> 3156 /// <summary>
@@ -3164,17 +3178,16 @@ namespace OpenSim.Region.Framework.Scenes
3164 if (!UUID.TryParse(sound, out soundID)) 3178 if (!UUID.TryParse(sound, out soundID))
3165 { 3179 {
3166 // search sound file from inventory 3180 // search sound file from inventory
3167 lock (TaskInventory) 3181 TaskInventory.LockItemsForRead(true);
3182 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
3168 { 3183 {
3169 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 3184 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound)
3170 { 3185 {
3171 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) 3186 soundID = item.Value.ItemID;
3172 { 3187 break;
3173 soundID = item.Value.ItemID;
3174 break;
3175 }
3176 } 3188 }
3177 } 3189 }
3190 TaskInventory.LockItemsForRead(false);
3178 } 3191 }
3179 3192
3180 if (soundID == UUID.Zero) 3193 if (soundID == UUID.Zero)
@@ -3611,7 +3624,7 @@ namespace OpenSim.Region.Framework.Scenes
3611 3624
3612 public void StopLookAt() 3625 public void StopLookAt()
3613 { 3626 {
3614 m_parentGroup.stopLookAt(); 3627 m_parentGroup.stopLookAt(); // This calls method in SceneObjectGroup.
3615 3628
3616 m_parentGroup.ScheduleGroupForTerseUpdate(); 3629 m_parentGroup.ScheduleGroupForTerseUpdate();
3617 } 3630 }
@@ -3638,10 +3651,9 @@ namespace OpenSim.Region.Framework.Scenes
3638 m_parentGroup.ScheduleGroupForTerseUpdate(); 3651 m_parentGroup.ScheduleGroupForTerseUpdate();
3639 //m_parentGroup.ScheduleGroupForFullUpdate(); 3652 //m_parentGroup.ScheduleGroupForFullUpdate();
3640 } 3653 }
3641 3654 public void StoreUndoState(UndoType type)
3642 public void StoreUndoState()
3643 { 3655 {
3644 if (!Undoing) 3656 if (!Undoing && (m_parentGroup == null || m_parentGroup.RootPart == null || !m_parentGroup.RootPart.Undoing))
3645 { 3657 {
3646 if (!IgnoreUndoUpdate) 3658 if (!IgnoreUndoUpdate)
3647 { 3659 {
@@ -3652,17 +3664,25 @@ namespace OpenSim.Region.Framework.Scenes
3652 if (m_undo.Count > 0) 3664 if (m_undo.Count > 0)
3653 { 3665 {
3654 UndoState last = m_undo.Peek(); 3666 UndoState last = m_undo.Peek();
3655 if (last != null) 3667
3656 {
3657 if (last.Compare(this))
3658 return;
3659 }
3660 } 3668 }
3661 3669
3662 if (m_parentGroup.GetSceneMaxUndo() > 0) 3670 if (m_parentGroup.GetSceneMaxUndo() > 0)
3663 { 3671 {
3664 UndoState nUndo = new UndoState(this); 3672 UndoState lastUndo = m_undo.Peek();
3665 3673
3674 UndoState nUndo = new UndoState(this, type);
3675
3676 if (lastUndo != null)
3677 {
3678 TimeSpan ts = DateTime.Now.Subtract(lastUndo.LastUpdated);
3679 if (ts.TotalMilliseconds < 500)
3680 {
3681 //Delete the last entry since it was less than 500 milliseconds ago
3682 nUndo.Merge(lastUndo);
3683 m_undo.Pop();
3684 }
3685 }
3666 m_undo.Push(nUndo); 3686 m_undo.Push(nUndo);
3667 } 3687 }
3668 3688
@@ -4139,11 +4159,13 @@ namespace OpenSim.Region.Framework.Scenes
4139 if (m_undo.Count > 0) 4159 if (m_undo.Count > 0)
4140 { 4160 {
4141 UndoState nUndo = null; 4161 UndoState nUndo = null;
4162 UndoState goback = m_undo.Pop();
4142 if (m_parentGroup.GetSceneMaxUndo() > 0) 4163 if (m_parentGroup.GetSceneMaxUndo() > 0)
4143 { 4164 {
4144 nUndo = new UndoState(this); 4165 nUndo = new UndoState(this, goback.Type);
4145 } 4166 }
4146 UndoState goback = m_undo.Pop(); 4167
4168
4147 if (goback != null) 4169 if (goback != null)
4148 { 4170 {
4149 goback.PlaybackState(this); 4171 goback.PlaybackState(this);
@@ -4158,13 +4180,13 @@ namespace OpenSim.Region.Framework.Scenes
4158 { 4180 {
4159 lock (m_redo) 4181 lock (m_redo)
4160 { 4182 {
4183 UndoState gofwd = m_redo.Pop();
4161 if (m_parentGroup.GetSceneMaxUndo() > 0) 4184 if (m_parentGroup.GetSceneMaxUndo() > 0)
4162 { 4185 {
4163 UndoState nUndo = new UndoState(this); 4186 UndoState nUndo = new UndoState(this, gofwd.Type);
4164 4187
4165 m_undo.Push(nUndo); 4188 m_undo.Push(nUndo);
4166 } 4189 }
4167 UndoState gofwd = m_redo.Pop();
4168 if (gofwd != null) 4190 if (gofwd != null)
4169 gofwd.PlayfwdState(this); 4191 gofwd.PlayfwdState(this);
4170 } 4192 }
@@ -4612,8 +4634,9 @@ namespace OpenSim.Region.Framework.Scenes
4612 { 4634 {
4613 m_shape.TextureEntry = textureEntry; 4635 m_shape.TextureEntry = textureEntry;
4614 TriggerScriptChangedEvent(Changed.TEXTURE); 4636 TriggerScriptChangedEvent(Changed.TEXTURE);
4615 4637 m_updateFlag = 1;
4616 ParentGroup.HasGroupChanged = true; 4638 ParentGroup.HasGroupChanged = true;
4639
4617 //This is madness.. 4640 //This is madness..
4618 //ParentGroup.ScheduleGroupForFullUpdate(); 4641 //ParentGroup.ScheduleGroupForFullUpdate();
4619 //This is sparta 4642 //This is sparta
@@ -4846,5 +4869,17 @@ namespace OpenSim.Region.Framework.Scenes
4846 Color color = Color; 4869 Color color = Color;
4847 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A)); 4870 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
4848 } 4871 }
4872
4873 public void ResetOwnerChangeFlag()
4874 {
4875 List<UUID> inv = Inventory.GetInventoryList();
4876
4877 foreach (UUID itemID in inv)
4878 {
4879 TaskInventoryItem item = Inventory.GetInventoryItem(itemID);
4880 item.OwnerChanged = false;
4881 Inventory.UpdateInventoryItem(item, false, false);
4882 }
4883 }
4849 } 4884 }
4850} 4885}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 6a204c3..8fcfcc5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -47,6 +47,8 @@ namespace OpenSim.Region.Framework.Scenes
47 47
48 private string m_inventoryFileName = String.Empty; 48 private string m_inventoryFileName = String.Empty;
49 private int m_inventoryFileNameSerial = 0; 49 private int m_inventoryFileNameSerial = 0;
50
51 private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
50 52
51 /// <value> 53 /// <value>
52 /// The part to which the inventory belongs. 54 /// The part to which the inventory belongs.
@@ -83,7 +85,9 @@ namespace OpenSim.Region.Framework.Scenes
83 /// </value> 85 /// </value>
84 protected internal TaskInventoryDictionary Items 86 protected internal TaskInventoryDictionary Items
85 { 87 {
86 get { return m_items; } 88 get {
89 return m_items;
90 }
87 set 91 set
88 { 92 {
89 m_items = value; 93 m_items = value;
@@ -119,39 +123,45 @@ namespace OpenSim.Region.Framework.Scenes
119 /// <param name="linkNum">Link number for the part</param> 123 /// <param name="linkNum">Link number for the part</param>
120 public void ResetInventoryIDs() 124 public void ResetInventoryIDs()
121 { 125 {
122 if (null == m_part || null == m_part.ParentGroup) 126 m_items.LockItemsForWrite(true);
123 return; 127
124 128 if (Items.Count == 0)
125 lock (m_items)
126 { 129 {
127 if (0 == m_items.Count) 130 m_items.LockItemsForWrite(false);
128 return; 131 return;
132 }
129 133
130 IList<TaskInventoryItem> items = GetInventoryItems(); 134 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
131 m_items.Clear(); 135 Items.Clear();
132 136
133 foreach (TaskInventoryItem item in items) 137 foreach (TaskInventoryItem item in items)
134 { 138 {
135 item.ResetIDs(m_part.UUID); 139 item.ResetIDs(m_part.UUID);
136 m_items.Add(item.ItemID, item); 140 Items.Add(item.ItemID, item);
137 }
138 } 141 }
142 m_items.LockItemsForWrite(false);
139 } 143 }
140 144
141 public void ResetObjectID() 145 public void ResetObjectID()
142 { 146 {
143 lock (Items) 147 m_items.LockItemsForWrite(true);
148
149 if (Items.Count == 0)
144 { 150 {
145 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 151 m_items.LockItemsForWrite(false);
146 Items.Clear(); 152 return;
147
148 foreach (TaskInventoryItem item in items)
149 {
150 item.ParentPartID = m_part.UUID;
151 item.ParentID = m_part.UUID;
152 Items.Add(item.ItemID, item);
153 }
154 } 153 }
154
155 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
156 Items.Clear();
157
158 foreach (TaskInventoryItem item in items)
159 {
160 item.ParentPartID = m_part.UUID;
161 item.ParentID = m_part.UUID;
162 Items.Add(item.ItemID, item);
163 }
164 m_items.LockItemsForWrite(false);
155 } 165 }
156 166
157 /// <summary> 167 /// <summary>
@@ -160,12 +170,11 @@ namespace OpenSim.Region.Framework.Scenes
160 /// <param name="ownerId"></param> 170 /// <param name="ownerId"></param>
161 public void ChangeInventoryOwner(UUID ownerId) 171 public void ChangeInventoryOwner(UUID ownerId)
162 { 172 {
163 lock (Items) 173 m_items.LockItemsForWrite(true);
174 if (0 == Items.Count)
164 { 175 {
165 if (0 == Items.Count) 176 m_items.LockItemsForWrite(false);
166 { 177 return;
167 return;
168 }
169 } 178 }
170 179
171 HasInventoryChanged = true; 180 HasInventoryChanged = true;
@@ -179,6 +188,7 @@ namespace OpenSim.Region.Framework.Scenes
179 item.OwnerID = ownerId; 188 item.OwnerID = ownerId;
180 } 189 }
181 } 190 }
191 m_items.LockItemsForWrite(false);
182 } 192 }
183 193
184 /// <summary> 194 /// <summary>
@@ -187,12 +197,11 @@ namespace OpenSim.Region.Framework.Scenes
187 /// <param name="groupID"></param> 197 /// <param name="groupID"></param>
188 public void ChangeInventoryGroup(UUID groupID) 198 public void ChangeInventoryGroup(UUID groupID)
189 { 199 {
190 lock (Items) 200 m_items.LockItemsForWrite(true);
201 if (0 == Items.Count)
191 { 202 {
192 if (0 == Items.Count) 203 m_items.LockItemsForWrite(false);
193 { 204 return;
194 return;
195 }
196 } 205 }
197 206
198 // Don't let this set the HasGroupChanged flag for attachments 207 // Don't let this set the HasGroupChanged flag for attachments
@@ -204,12 +213,15 @@ namespace OpenSim.Region.Framework.Scenes
204 m_part.ParentGroup.HasGroupChanged = true; 213 m_part.ParentGroup.HasGroupChanged = true;
205 } 214 }
206 215
207 List<TaskInventoryItem> items = GetInventoryItems(); 216 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
208 foreach (TaskInventoryItem item in items) 217 foreach (TaskInventoryItem item in items)
209 { 218 {
210 if (groupID != item.GroupID) 219 if (groupID != item.GroupID)
220 {
211 item.GroupID = groupID; 221 item.GroupID = groupID;
222 }
212 } 223 }
224 m_items.LockItemsForWrite(false);
213 } 225 }
214 226
215 /// <summary> 227 /// <summary>
@@ -217,9 +229,14 @@ namespace OpenSim.Region.Framework.Scenes
217 /// </summary> 229 /// </summary>
218 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 230 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
219 { 231 {
220 List<TaskInventoryItem> scripts = GetInventoryScripts(); 232 Items.LockItemsForRead(true);
221 foreach (TaskInventoryItem item in scripts) 233 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
222 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 234 Items.LockItemsForRead(false);
235 foreach (TaskInventoryItem item in items)
236 {
237 if ((int)InventoryType.LSL == item.InvType)
238 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
239 }
223 } 240 }
224 241
225 public ArrayList GetScriptErrors(UUID itemID) 242 public ArrayList GetScriptErrors(UUID itemID)
@@ -252,9 +269,18 @@ namespace OpenSim.Region.Framework.Scenes
252 /// </param> 269 /// </param>
253 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 270 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
254 { 271 {
255 List<TaskInventoryItem> scripts = GetInventoryScripts(); 272 Items.LockItemsForRead(true);
256 foreach (TaskInventoryItem item in scripts) 273 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
257 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); 274 Items.LockItemsForRead(false);
275
276 foreach (TaskInventoryItem item in items)
277 {
278 if ((int)InventoryType.LSL == item.InvType)
279 {
280 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
281 m_part.RemoveScriptEvents(item.ItemID);
282 }
283 }
258 } 284 }
259 285
260 /// <summary> 286 /// <summary>
@@ -270,7 +296,10 @@ namespace OpenSim.Region.Framework.Scenes
270 // item.Name, item.ItemID, Name, UUID); 296 // item.Name, item.ItemID, Name, UUID);
271 297
272 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) 298 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
299 {
300 StoreScriptError(item.ItemID, "no permission");
273 return; 301 return;
302 }
274 303
275 m_part.AddFlag(PrimFlags.Scripted); 304 m_part.AddFlag(PrimFlags.Scripted);
276 305
@@ -279,14 +308,13 @@ namespace OpenSim.Region.Framework.Scenes
279 if (stateSource == 2 && // Prim crossing 308 if (stateSource == 2 && // Prim crossing
280 m_part.ParentGroup.Scene.m_trustBinaries) 309 m_part.ParentGroup.Scene.m_trustBinaries)
281 { 310 {
282 lock (m_items) 311 m_items.LockItemsForWrite(true);
283 { 312 m_items[item.ItemID].PermsMask = 0;
284 m_items[item.ItemID].PermsMask = 0; 313 m_items[item.ItemID].PermsGranter = UUID.Zero;
285 m_items[item.ItemID].PermsGranter = UUID.Zero; 314 m_items.LockItemsForWrite(false);
286 }
287
288 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 315 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
289 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource); 316 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
317 StoreScriptErrors(item.ItemID, null);
290 m_part.ParentGroup.AddActiveScriptCount(1); 318 m_part.ParentGroup.AddActiveScriptCount(1);
291 m_part.ScheduleFullUpdate(); 319 m_part.ScheduleFullUpdate();
292 return; 320 return;
@@ -295,6 +323,8 @@ namespace OpenSim.Region.Framework.Scenes
295 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 323 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
296 if (null == asset) 324 if (null == asset)
297 { 325 {
326 string msg = String.Format("asset ID {0} could not be found", item.AssetID);
327 StoreScriptError(item.ItemID, msg);
298 m_log.ErrorFormat( 328 m_log.ErrorFormat(
299 "[PRIM INVENTORY]: " + 329 "[PRIM INVENTORY]: " +
300 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", 330 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
@@ -306,15 +336,17 @@ namespace OpenSim.Region.Framework.Scenes
306 if (m_part.ParentGroup.m_savedScriptState != null) 336 if (m_part.ParentGroup.m_savedScriptState != null)
307 RestoreSavedScriptState(item.OldItemID, item.ItemID); 337 RestoreSavedScriptState(item.OldItemID, item.ItemID);
308 338
309 lock (m_items) 339 m_items.LockItemsForWrite(true);
310 { 340
311 m_items[item.ItemID].PermsMask = 0; 341 m_items[item.ItemID].PermsMask = 0;
312 m_items[item.ItemID].PermsGranter = UUID.Zero; 342 m_items[item.ItemID].PermsGranter = UUID.Zero;
313 } 343
344 m_items.LockItemsForWrite(false);
314 345
315 string script = Utils.BytesToString(asset.Data); 346 string script = Utils.BytesToString(asset.Data);
316 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 347 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
317 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource); 348 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
349 StoreScriptErrors(item.ItemID, null);
318 m_part.ParentGroup.AddActiveScriptCount(1); 350 m_part.ParentGroup.AddActiveScriptCount(1);
319 m_part.ScheduleFullUpdate(); 351 m_part.ScheduleFullUpdate();
320 } 352 }
@@ -378,21 +410,145 @@ namespace OpenSim.Region.Framework.Scenes
378 410
379 /// <summary> 411 /// <summary>
380 /// Start a script which is in this prim's inventory. 412 /// Start a script which is in this prim's inventory.
413 /// Some processing may occur in the background, but this routine returns asap.
381 /// </summary> 414 /// </summary>
382 /// <param name="itemId"> 415 /// <param name="itemId">
383 /// A <see cref="UUID"/> 416 /// A <see cref="UUID"/>
384 /// </param> 417 /// </param>
385 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) 418 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
386 { 419 {
387 TaskInventoryItem item = GetInventoryItem(itemId); 420 lock (m_scriptErrors)
388 if (item != null) 421 {
389 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 422 // Indicate to CreateScriptInstanceInternal() we don't want it to wait for completion
423 m_scriptErrors.Remove(itemId);
424 }
425 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
426 }
427
428 private void CreateScriptInstanceInternal(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
429 {
430 m_items.LockItemsForRead(true);
431 if (m_items.ContainsKey(itemId))
432 {
433 if (m_items.ContainsKey(itemId))
434 {
435 m_items.LockItemsForRead(false);
436 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
437 }
438 else
439 {
440 m_items.LockItemsForRead(false);
441 string msg = String.Format("couldn't be found for prim {0}, {1} at {2} in {3}", m_part.Name, m_part.UUID,
442 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
443 StoreScriptError(itemId, msg);
444 m_log.ErrorFormat(
445 "[PRIM INVENTORY]: " +
446 "Couldn't start script with ID {0} since it {1}", itemId, msg);
447 }
448 }
390 else 449 else
450 {
451 m_items.LockItemsForRead(false);
452 string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID);
453 StoreScriptError(itemId, msg);
391 m_log.ErrorFormat( 454 m_log.ErrorFormat(
392 "[PRIM INVENTORY]: " + 455 "[PRIM INVENTORY]: " +
393 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", 456 "Couldn't start script with ID {0} since it {1}", itemId, msg);
394 itemId, m_part.Name, m_part.UUID, 457 }
395 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 458
459 }
460
461 /// <summary>
462 /// Start a script which is in this prim's inventory and return any compilation error messages.
463 /// </summary>
464 /// <param name="itemId">
465 /// A <see cref="UUID"/>
466 /// </param>
467 public ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
468 {
469 ArrayList errors;
470
471 // Indicate to CreateScriptInstanceInternal() we want it to
472 // post any compilation/loading error messages
473 lock (m_scriptErrors)
474 {
475 m_scriptErrors[itemId] = null;
476 }
477
478 // Perform compilation/loading
479 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
480
481 // Wait for and retrieve any errors
482 lock (m_scriptErrors)
483 {
484 while ((errors = m_scriptErrors[itemId]) == null)
485 {
486 if (!System.Threading.Monitor.Wait(m_scriptErrors, 15000))
487 {
488 m_log.ErrorFormat(
489 "[PRIM INVENTORY]: " +
490 "timedout waiting for script {0} errors", itemId);
491 errors = m_scriptErrors[itemId];
492 if (errors == null)
493 {
494 errors = new ArrayList(1);
495 errors.Add("timedout waiting for errors");
496 }
497 break;
498 }
499 }
500 m_scriptErrors.Remove(itemId);
501 }
502 return errors;
503 }
504
505 // Signal to CreateScriptInstanceEr() that compilation/loading is complete
506 private void StoreScriptErrors(UUID itemId, ArrayList errors)
507 {
508 lock (m_scriptErrors)
509 {
510 // If compilation/loading initiated via CreateScriptInstance(),
511 // it does not want the errors, so just get out
512 if (!m_scriptErrors.ContainsKey(itemId))
513 {
514 return;
515 }
516
517 // Initiated via CreateScriptInstanceEr(), if we know what the
518 // errors are, save them and wake CreateScriptInstanceEr().
519 if (errors != null)
520 {
521 m_scriptErrors[itemId] = errors;
522 System.Threading.Monitor.PulseAll(m_scriptErrors);
523 return;
524 }
525 }
526
527 // Initiated via CreateScriptInstanceEr() but we don't know what
528 // the errors are yet, so retrieve them from the script engine.
529 // This may involve some waiting internal to GetScriptErrors().
530 errors = GetScriptErrors(itemId);
531
532 // Get a default non-null value to indicate success.
533 if (errors == null)
534 {
535 errors = new ArrayList();
536 }
537
538 // Post to CreateScriptInstanceEr() and wake it up
539 lock (m_scriptErrors)
540 {
541 m_scriptErrors[itemId] = errors;
542 System.Threading.Monitor.PulseAll(m_scriptErrors);
543 }
544 }
545
546 // Like StoreScriptErrors(), but just posts a single string message
547 private void StoreScriptError(UUID itemId, string message)
548 {
549 ArrayList errors = new ArrayList(1);
550 errors.Add(message);
551 StoreScriptErrors(itemId, errors);
396 } 552 }
397 553
398 /// <summary> 554 /// <summary>
@@ -405,15 +561,7 @@ namespace OpenSim.Region.Framework.Scenes
405 /// </param> 561 /// </param>
406 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted) 562 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted)
407 { 563 {
408 bool scriptPresent = false; 564 if (m_items.ContainsKey(itemId))
409
410 lock (m_items)
411 {
412 if (m_items.ContainsKey(itemId))
413 scriptPresent = true;
414 }
415
416 if (scriptPresent)
417 { 565 {
418 if (!sceneObjectBeingDeleted) 566 if (!sceneObjectBeingDeleted)
419 m_part.RemoveScriptEvents(itemId); 567 m_part.RemoveScriptEvents(itemId);
@@ -438,14 +586,16 @@ namespace OpenSim.Region.Framework.Scenes
438 /// <returns></returns> 586 /// <returns></returns>
439 private bool InventoryContainsName(string name) 587 private bool InventoryContainsName(string name)
440 { 588 {
441 lock (m_items) 589 m_items.LockItemsForRead(true);
590 foreach (TaskInventoryItem item in m_items.Values)
442 { 591 {
443 foreach (TaskInventoryItem item in m_items.Values) 592 if (item.Name == name)
444 { 593 {
445 if (item.Name == name) 594 m_items.LockItemsForRead(false);
446 return true; 595 return true;
447 } 596 }
448 } 597 }
598 m_items.LockItemsForRead(false);
449 return false; 599 return false;
450 } 600 }
451 601
@@ -487,8 +637,9 @@ namespace OpenSim.Region.Framework.Scenes
487 /// <param name="item"></param> 637 /// <param name="item"></param>
488 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) 638 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
489 { 639 {
490 List<TaskInventoryItem> il = GetInventoryItems(); 640 m_items.LockItemsForRead(true);
491 641 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
642 m_items.LockItemsForRead(false);
492 foreach (TaskInventoryItem i in il) 643 foreach (TaskInventoryItem i in il)
493 { 644 {
494 if (i.Name == item.Name) 645 if (i.Name == item.Name)
@@ -526,14 +677,14 @@ namespace OpenSim.Region.Framework.Scenes
526 item.Name = name; 677 item.Name = name;
527 item.GroupID = m_part.GroupID; 678 item.GroupID = m_part.GroupID;
528 679
529 lock (m_items) 680 m_items.LockItemsForWrite(true);
530 m_items.Add(item.ItemID, item); 681 m_items.Add(item.ItemID, item);
531 682 m_items.LockItemsForWrite(false);
532 if (allowedDrop) 683 if (allowedDrop)
533 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); 684 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
534 else 685 else
535 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 686 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
536 687
537 m_inventorySerial++; 688 m_inventorySerial++;
538 //m_inventorySerial += 2; 689 //m_inventorySerial += 2;
539 HasInventoryChanged = true; 690 HasInventoryChanged = true;
@@ -549,15 +700,15 @@ namespace OpenSim.Region.Framework.Scenes
549 /// <param name="items"></param> 700 /// <param name="items"></param>
550 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items) 701 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
551 { 702 {
552 lock (m_items) 703 m_items.LockItemsForWrite(true);
704 foreach (TaskInventoryItem item in items)
553 { 705 {
554 foreach (TaskInventoryItem item in items) 706 m_items.Add(item.ItemID, item);
555 { 707// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
556 m_items.Add(item.ItemID, item);
557// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
558 }
559 m_inventorySerial++;
560 } 708 }
709 m_items.LockItemsForWrite(false);
710
711 m_inventorySerial++;
561 } 712 }
562 713
563 /// <summary> 714 /// <summary>
@@ -568,10 +719,9 @@ namespace OpenSim.Region.Framework.Scenes
568 public TaskInventoryItem GetInventoryItem(UUID itemId) 719 public TaskInventoryItem GetInventoryItem(UUID itemId)
569 { 720 {
570 TaskInventoryItem item; 721 TaskInventoryItem item;
571 722 m_items.LockItemsForRead(true);
572 lock (m_items) 723 m_items.TryGetValue(itemId, out item);
573 m_items.TryGetValue(itemId, out item); 724 m_items.LockItemsForRead(false);
574
575 return item; 725 return item;
576 } 726 }
577 727
@@ -587,15 +737,16 @@ namespace OpenSim.Region.Framework.Scenes
587 { 737 {
588 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(); 738 IList<TaskInventoryItem> items = new List<TaskInventoryItem>();
589 739
590 lock (m_items) 740 m_items.LockItemsForRead(true);
741
742 foreach (TaskInventoryItem item in m_items.Values)
591 { 743 {
592 foreach (TaskInventoryItem item in m_items.Values) 744 if (item.Name == name)
593 { 745 items.Add(item);
594 if (item.Name == name)
595 items.Add(item);
596 }
597 } 746 }
598 747
748 m_items.LockItemsForRead(false);
749
599 return items; 750 return items;
600 } 751 }
601 752
@@ -678,9 +829,9 @@ namespace OpenSim.Region.Framework.Scenes
678 829
679 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged) 830 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged)
680 { 831 {
681 TaskInventoryItem it = GetInventoryItem(item.ItemID); 832 m_items.LockItemsForWrite(true);
682 if (it != null)
683 833
834 if (m_items.ContainsKey(item.ItemID))
684 { 835 {
685 item.ParentID = m_part.UUID; 836 item.ParentID = m_part.UUID;
686 item.ParentPartID = m_part.UUID; 837 item.ParentPartID = m_part.UUID;
@@ -692,14 +843,10 @@ namespace OpenSim.Region.Framework.Scenes
692 item.GroupID = m_part.GroupID; 843 item.GroupID = m_part.GroupID;
693 844
694 if (item.AssetID == UUID.Zero) 845 if (item.AssetID == UUID.Zero)
695 item.AssetID = it.AssetID; 846 item.AssetID = m_items[item.ItemID].AssetID;
696
697 lock (m_items)
698 {
699 m_items[item.ItemID] = item;
700 m_inventorySerial++;
701 }
702 847
848 m_items[item.ItemID] = item;
849 m_inventorySerial++;
703 if (fireScriptEvents) 850 if (fireScriptEvents)
704 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 851 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
705 if (considerChanged) 852 if (considerChanged)
@@ -707,6 +854,7 @@ namespace OpenSim.Region.Framework.Scenes
707 HasInventoryChanged = true; 854 HasInventoryChanged = true;
708 m_part.ParentGroup.HasGroupChanged = true; 855 m_part.ParentGroup.HasGroupChanged = true;
709 } 856 }
857 m_items.LockItemsForWrite(false);
710 return true; 858 return true;
711 } 859 }
712 else 860 else
@@ -717,8 +865,9 @@ namespace OpenSim.Region.Framework.Scenes
717 item.ItemID, m_part.Name, m_part.UUID, 865 item.ItemID, m_part.Name, m_part.UUID,
718 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 866 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
719 } 867 }
720 return false; 868 m_items.LockItemsForWrite(false);
721 869
870 return false;
722 } 871 }
723 872
724 /// <summary> 873 /// <summary>
@@ -729,37 +878,53 @@ namespace OpenSim.Region.Framework.Scenes
729 /// in this prim's inventory.</returns> 878 /// in this prim's inventory.</returns>
730 public int RemoveInventoryItem(UUID itemID) 879 public int RemoveInventoryItem(UUID itemID)
731 { 880 {
732 TaskInventoryItem item = GetInventoryItem(itemID); 881 m_items.LockItemsForRead(true);
733 if (item != null) 882
883 if (m_items.ContainsKey(itemID))
734 { 884 {
735 int type = m_items[itemID].InvType; 885 int type = m_items[itemID].InvType;
886 m_items.LockItemsForRead(false);
736 if (type == 10) // Script 887 if (type == 10) // Script
737 { 888 {
738 m_part.RemoveScriptEvents(itemID);
739 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); 889 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
740 } 890 }
891 m_items.LockItemsForWrite(true);
741 m_items.Remove(itemID); 892 m_items.Remove(itemID);
893 m_items.LockItemsForWrite(false);
742 m_inventorySerial++; 894 m_inventorySerial++;
743 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 895 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
744 896
745 HasInventoryChanged = true; 897 HasInventoryChanged = true;
746 m_part.ParentGroup.HasGroupChanged = true; 898 m_part.ParentGroup.HasGroupChanged = true;
747 899
748 if (!ContainsScripts()) 900 int scriptcount = 0;
901 m_items.LockItemsForRead(true);
902 foreach (TaskInventoryItem item in m_items.Values)
903 {
904 if (item.Type == 10)
905 {
906 scriptcount++;
907 }
908 }
909 m_items.LockItemsForRead(false);
910
911
912 if (scriptcount <= 0)
913 {
749 m_part.RemFlag(PrimFlags.Scripted); 914 m_part.RemFlag(PrimFlags.Scripted);
915 }
750 916
751 m_part.ScheduleFullUpdate(); 917 m_part.ScheduleFullUpdate();
752 918
753 return type; 919 return type;
754
755 } 920 }
756 else 921 else
757 { 922 {
923 m_items.LockItemsForRead(false);
758 m_log.ErrorFormat( 924 m_log.ErrorFormat(
759 "[PRIM INVENTORY]: " + 925 "[PRIM INVENTORY]: " +
760 "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", 926 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
761 itemID, m_part.Name, m_part.UUID, 927 itemID, m_part.Name, m_part.UUID);
762 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
763 } 928 }
764 929
765 return -1; 930 return -1;
@@ -867,6 +1032,8 @@ namespace OpenSim.Region.Framework.Scenes
867 invString.AddSectionEnd(); 1032 invString.AddSectionEnd();
868 } 1033 }
869 } 1034 }
1035 int count = m_items.Count;
1036 m_items.LockItemsForRead(false);
870 1037
871 fileData = Utils.StringToBytes(invString.BuildString); 1038 fileData = Utils.StringToBytes(invString.BuildString);
872 1039
@@ -887,10 +1054,11 @@ namespace OpenSim.Region.Framework.Scenes
887 { 1054 {
888 if (HasInventoryChanged) 1055 if (HasInventoryChanged)
889 { 1056 {
890 HasInventoryChanged = false; 1057 Items.LockItemsForRead(true);
891 List<TaskInventoryItem> items = GetInventoryItems(); 1058 datastore.StorePrimInventory(m_part.UUID, Items.Values);
892 datastore.StorePrimInventory(m_part.UUID, items); 1059 Items.LockItemsForRead(false);
893 1060
1061 HasInventoryChanged = false;
894 } 1062 }
895 } 1063 }
896 1064
@@ -957,89 +1125,75 @@ namespace OpenSim.Region.Framework.Scenes
957 { 1125 {
958 uint mask=0x7fffffff; 1126 uint mask=0x7fffffff;
959 1127
960 lock (m_items) 1128 foreach (TaskInventoryItem item in m_items.Values)
961 { 1129 {
962 foreach (TaskInventoryItem item in m_items.Values) 1130 if (item.InvType != (int)InventoryType.Object)
963 { 1131 {
964 if (item.InvType != (int)InventoryType.Object) 1132 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
965 { 1133 mask &= ~((uint)PermissionMask.Copy >> 13);
966 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) 1134 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
967 mask &= ~((uint)PermissionMask.Copy >> 13); 1135 mask &= ~((uint)PermissionMask.Transfer >> 13);
968 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0) 1136 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
969 mask &= ~((uint)PermissionMask.Transfer >> 13); 1137 mask &= ~((uint)PermissionMask.Modify >> 13);
970 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0) 1138 }
971 mask &= ~((uint)PermissionMask.Modify >> 13); 1139 else
972 } 1140 {
973 else 1141 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
974 { 1142 mask &= ~((uint)PermissionMask.Copy >> 13);
975 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 1143 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
976 mask &= ~((uint)PermissionMask.Copy >> 13); 1144 mask &= ~((uint)PermissionMask.Transfer >> 13);
977 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 1145 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
978 mask &= ~((uint)PermissionMask.Transfer >> 13); 1146 mask &= ~((uint)PermissionMask.Modify >> 13);
979 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
980 mask &= ~((uint)PermissionMask.Modify >> 13);
981 }
982
983 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
984 mask &= ~(uint)PermissionMask.Copy;
985 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
986 mask &= ~(uint)PermissionMask.Transfer;
987 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
988 mask &= ~(uint)PermissionMask.Modify;
989 } 1147 }
1148
1149 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1150 mask &= ~(uint)PermissionMask.Copy;
1151 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1152 mask &= ~(uint)PermissionMask.Transfer;
1153 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1154 mask &= ~(uint)PermissionMask.Modify;
990 } 1155 }
991
992 return mask; 1156 return mask;
993 } 1157 }
994 1158
995 public void ApplyNextOwnerPermissions() 1159 public void ApplyNextOwnerPermissions()
996 { 1160 {
997 lock (m_items) 1161 foreach (TaskInventoryItem item in m_items.Values)
998 { 1162 {
999 foreach (TaskInventoryItem item in m_items.Values) 1163 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
1000 { 1164 {
1001 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) 1165 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1002 { 1166 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
1003 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 1167 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1004 item.CurrentPermissions &= ~(uint)PermissionMask.Copy; 1168 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
1005 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 1169 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1006 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; 1170 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1007 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1008 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1009 }
1010 item.CurrentPermissions &= item.NextPermissions;
1011 item.BasePermissions &= item.NextPermissions;
1012 item.EveryonePermissions &= item.NextPermissions;
1013 item.OwnerChanged = true;
1014 } 1171 }
1172 item.OwnerChanged = true;
1173 item.CurrentPermissions &= item.NextPermissions;
1174 item.BasePermissions &= item.NextPermissions;
1175 item.EveryonePermissions &= item.NextPermissions;
1015 } 1176 }
1016 } 1177 }
1017 1178
1018 public void ApplyGodPermissions(uint perms) 1179 public void ApplyGodPermissions(uint perms)
1019 { 1180 {
1020 lock (m_items) 1181 foreach (TaskInventoryItem item in m_items.Values)
1021 { 1182 {
1022 foreach (TaskInventoryItem item in m_items.Values) 1183 item.CurrentPermissions = perms;
1023 { 1184 item.BasePermissions = perms;
1024 item.CurrentPermissions = perms;
1025 item.BasePermissions = perms;
1026 }
1027 } 1185 }
1028 } 1186 }
1029 1187
1030 public bool ContainsScripts() 1188 public bool ContainsScripts()
1031 { 1189 {
1032 lock (m_items) 1190 foreach (TaskInventoryItem item in m_items.Values)
1033 { 1191 {
1034 foreach (TaskInventoryItem item in m_items.Values) 1192 if (item.InvType == (int)InventoryType.LSL)
1035 { 1193 {
1036 if (item.InvType == (int)InventoryType.LSL) 1194 return true;
1037 {
1038 return true;
1039 }
1040 } 1195 }
1041 } 1196 }
1042
1043 return false; 1197 return false;
1044 } 1198 }
1045 1199
@@ -1047,11 +1201,8 @@ namespace OpenSim.Region.Framework.Scenes
1047 { 1201 {
1048 List<UUID> ret = new List<UUID>(); 1202 List<UUID> ret = new List<UUID>();
1049 1203
1050 lock (m_items) 1204 foreach (TaskInventoryItem item in m_items.Values)
1051 { 1205 ret.Add(item.ItemID);
1052 foreach (TaskInventoryItem item in m_items.Values)
1053 ret.Add(item.ItemID);
1054 }
1055 1206
1056 return ret; 1207 return ret;
1057 } 1208 }
@@ -1082,31 +1233,46 @@ namespace OpenSim.Region.Framework.Scenes
1082 1233
1083 public Dictionary<UUID, string> GetScriptStates() 1234 public Dictionary<UUID, string> GetScriptStates()
1084 { 1235 {
1236 return GetScriptStates(false);
1237 }
1238
1239 public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
1240 {
1085 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); 1241 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
1086 1242
1087 Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); 1243 Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
1088 if (engines == null) // No engine at all 1244 if (engines == null) // No engine at all
1089 return ret; 1245 return ret;
1090 1246
1091 List<TaskInventoryItem> scripts = GetInventoryScripts(); 1247 Items.LockItemsForRead(true);
1092 1248 foreach (TaskInventoryItem item in m_items.Values)
1093 foreach (TaskInventoryItem item in scripts)
1094 { 1249 {
1095 foreach (IScriptModule e in engines) 1250 if (item.InvType == (int)InventoryType.LSL)
1096 { 1251 {
1097 if (e != null) 1252 foreach (IScriptModule e in engines)
1098 { 1253 {
1099 string n = e.GetXMLState(item.ItemID); 1254 if (e != null)
1100 if (n != String.Empty)
1101 { 1255 {
1102 if (!ret.ContainsKey(item.ItemID)) 1256 string n = e.GetXMLState(item.ItemID);
1103 ret[item.ItemID] = n; 1257 if (n != String.Empty)
1104 break; 1258 {
1259 if (oldIDs)
1260 {
1261 if (!ret.ContainsKey(item.OldItemID))
1262 ret[item.OldItemID] = n;
1263 }
1264 else
1265 {
1266 if (!ret.ContainsKey(item.ItemID))
1267 ret[item.ItemID] = n;
1268 }
1269 break;
1270 }
1105 } 1271 }
1106 } 1272 }
1107 } 1273 }
1108 } 1274 }
1109 1275 Items.LockItemsForRead(false);
1110 return ret; 1276 return ret;
1111 } 1277 }
1112 1278
@@ -1116,21 +1282,27 @@ namespace OpenSim.Region.Framework.Scenes
1116 if (engines == null) 1282 if (engines == null)
1117 return; 1283 return;
1118 1284
1119 List<TaskInventoryItem> scripts = GetInventoryScripts();
1120 1285
1121 foreach (TaskInventoryItem item in scripts) 1286 Items.LockItemsForRead(true);
1287
1288 foreach (TaskInventoryItem item in m_items.Values)
1122 { 1289 {
1123 foreach (IScriptModule engine in engines) 1290 if (item.InvType == (int)InventoryType.LSL)
1124 { 1291 {
1125 if (engine != null) 1292 foreach (IScriptModule engine in engines)
1126 { 1293 {
1127 if (item.OwnerChanged) 1294 if (engine != null)
1128 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER }); 1295 {
1129 item.OwnerChanged = false; 1296 if (item.OwnerChanged)
1130 engine.ResumeScript(item.ItemID); 1297 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
1298 item.OwnerChanged = false;
1299 engine.ResumeScript(item.ItemID);
1300 }
1131 } 1301 }
1132 } 1302 }
1133 } 1303 }
1304
1305 Items.LockItemsForRead(false);
1134 } 1306 }
1135 } 1307 }
1136} 1308}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index db69093..c35df08 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Reflection; 31using System.Reflection;
31using System.Timers; 32using System.Timers;
@@ -72,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
72// { 73// {
73// m_log.Debug("[ScenePresence] Destructor called"); 74// m_log.Debug("[ScenePresence] Destructor called");
74// } 75// }
75 76
76 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
77 78
78// private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes(); 79// private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes();
@@ -87,7 +88,9 @@ namespace OpenSim.Region.Framework.Scenes
87 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis 88 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
88 /// issue #1716 89 /// issue #1716
89 /// </summary> 90 /// </summary>
90 private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f); 91// private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f);
92 // Value revised by KF 091121 by comparison with SL.
93 private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
91 94
92 public UUID currentParcelUUID = UUID.Zero; 95 public UUID currentParcelUUID = UUID.Zero;
93 96
@@ -121,8 +124,11 @@ namespace OpenSim.Region.Framework.Scenes
121 public Vector3 lastKnownAllowedPosition; 124 public Vector3 lastKnownAllowedPosition;
122 public bool sentMessageAboutRestrictedParcelFlyingDown; 125 public bool sentMessageAboutRestrictedParcelFlyingDown;
123 public Vector4 CollisionPlane = Vector4.UnitW; 126 public Vector4 CollisionPlane = Vector4.UnitW;
124 127
128 private Vector3 m_avInitialPos; // used to calculate unscripted sit rotation
129 private Vector3 m_avUnscriptedSitPos; // for non-scripted prims
125 private Vector3 m_lastPosition; 130 private Vector3 m_lastPosition;
131 private Vector3 m_lastWorldPosition;
126 private Quaternion m_lastRotation; 132 private Quaternion m_lastRotation;
127 private Vector3 m_lastVelocity; 133 private Vector3 m_lastVelocity;
128 //private int m_lastTerseSent; 134 //private int m_lastTerseSent;
@@ -153,9 +159,10 @@ namespace OpenSim.Region.Framework.Scenes
153 private int m_perfMonMS; 159 private int m_perfMonMS;
154 160
155 private bool m_setAlwaysRun; 161 private bool m_setAlwaysRun;
156
157 private bool m_forceFly; 162 private bool m_forceFly;
158 private bool m_flyDisabled; 163 private bool m_flyDisabled;
164 private bool m_flyingOld; // add for fly velocity control
165 public bool m_wasFlying; // add for fly velocity control
159 166
160 private float m_speedModifier = 1.0f; 167 private float m_speedModifier = 1.0f;
161 168
@@ -174,7 +181,8 @@ namespace OpenSim.Region.Framework.Scenes
174 protected RegionInfo m_regionInfo; 181 protected RegionInfo m_regionInfo;
175 protected ulong crossingFromRegion; 182 protected ulong crossingFromRegion;
176 183
177 private readonly Vector3[] Dir_Vectors = new Vector3[9]; 184 private readonly Vector3[] Dir_Vectors = new Vector3[11];
185 private bool m_isNudging = false;
178 186
179 // Position of agent's camera in world (region cordinates) 187 // Position of agent's camera in world (region cordinates)
180 protected Vector3 m_CameraCenter; 188 protected Vector3 m_CameraCenter;
@@ -199,17 +207,25 @@ namespace OpenSim.Region.Framework.Scenes
199 private bool m_autopilotMoving; 207 private bool m_autopilotMoving;
200 private Vector3 m_autoPilotTarget; 208 private Vector3 m_autoPilotTarget;
201 private bool m_sitAtAutoTarget; 209 private bool m_sitAtAutoTarget;
210 private Vector3 m_initialSitTarget = Vector3.Zero; //KF: First estimate of where to sit
202 211
203 private string m_nextSitAnimation = String.Empty; 212 private string m_nextSitAnimation = String.Empty;
204 213
205 //PauPaw:Proper PID Controler for autopilot************ 214 //PauPaw:Proper PID Controler for autopilot************
206 private bool m_moveToPositionInProgress; 215 private bool m_moveToPositionInProgress;
207 private Vector3 m_moveToPositionTarget; 216 private Vector3 m_moveToPositionTarget;
217 private Quaternion m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
208 218
209 private bool m_followCamAuto; 219 private bool m_followCamAuto;
210 220
211 private int m_movementUpdateCount; 221 private int m_movementUpdateCount;
222 private int m_lastColCount = -1; //KF: Look for Collision chnages
223 private int m_updateCount = 0; //KF: Update Anims for a while
224 private static readonly int UPDATE_COUNT = 10; // how many frames to update for
212 private const int NumMovementsBetweenRayCast = 5; 225 private const int NumMovementsBetweenRayCast = 5;
226 private List<uint> m_lastColliders = new List<uint>();
227
228 private object m_syncRoot = new Object();
213 229
214 private bool CameraConstraintActive; 230 private bool CameraConstraintActive;
215 //private int m_moveToPositionStateStatus; 231 //private int m_moveToPositionStateStatus;
@@ -236,7 +252,9 @@ namespace OpenSim.Region.Framework.Scenes
236 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS, 252 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS,
237 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG, 253 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG,
238 DIR_CONTROL_FLAG_FORWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS, 254 DIR_CONTROL_FLAG_FORWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS,
239 DIR_CONTROL_FLAG_BACKWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG, 255 DIR_CONTROL_FLAG_BACK_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG,
256 DIR_CONTROL_FLAG_LEFT_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS,
257 DIR_CONTROL_FLAG_RIGHT_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG,
240 DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG 258 DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG
241 } 259 }
242 260
@@ -443,9 +461,18 @@ namespace OpenSim.Region.Framework.Scenes
443 get 461 get
444 { 462 {
445 PhysicsActor actor = m_physicsActor; 463 PhysicsActor actor = m_physicsActor;
446 if (actor != null) 464// if (actor != null)
465 if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting!
447 m_pos = actor.Position; 466 m_pos = actor.Position;
448 467
468 // If we're sitting, we need to update our position
469 if (m_parentID != 0)
470 {
471 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
472 if (part != null)
473 m_parentPosition = part.AbsolutePosition;
474 }
475
449 return m_parentPosition + m_pos; 476 return m_parentPosition + m_pos;
450 } 477 }
451 set 478 set
@@ -464,7 +491,8 @@ namespace OpenSim.Region.Framework.Scenes
464 } 491 }
465 } 492 }
466 493
467 m_pos = value; 494 if (m_parentID == 0) // KF Do NOT update m_pos here if Av is sitting!
495 m_pos = value;
468 m_parentPosition = Vector3.Zero; 496 m_parentPosition = Vector3.Zero;
469 } 497 }
470 } 498 }
@@ -508,10 +536,39 @@ namespace OpenSim.Region.Framework.Scenes
508 } 536 }
509 } 537 }
510 538
539 public Quaternion OffsetRotation
540 {
541 get { return m_offsetRotation; }
542 set { m_offsetRotation = value; }
543 }
544
511 public Quaternion Rotation 545 public Quaternion Rotation
512 { 546 {
513 get { return m_bodyRot; } 547 get {
514 set { m_bodyRot = value; } 548 if (m_parentID != 0)
549 {
550 if (m_offsetRotation != null)
551 {
552 return m_offsetRotation;
553 }
554 else
555 {
556 return new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
557 }
558
559 }
560 else
561 {
562 return m_bodyRot;
563 }
564 }
565 set {
566 m_bodyRot = value;
567 if (m_parentID != 0)
568 {
569 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
570 }
571 }
515 } 572 }
516 573
517 public Quaternion PreviousRotation 574 public Quaternion PreviousRotation
@@ -536,11 +593,21 @@ namespace OpenSim.Region.Framework.Scenes
536 593
537 private uint m_parentID; 594 private uint m_parentID;
538 595
596
597 private UUID m_linkedPrim;
598
539 public uint ParentID 599 public uint ParentID
540 { 600 {
541 get { return m_parentID; } 601 get { return m_parentID; }
542 set { m_parentID = value; } 602 set { m_parentID = value; }
543 } 603 }
604
605 public UUID LinkedPrim
606 {
607 get { return m_linkedPrim; }
608 set { m_linkedPrim = value; }
609 }
610
544 public float Health 611 public float Health
545 { 612 {
546 get { return m_health; } 613 get { return m_health; }
@@ -662,7 +729,7 @@ namespace OpenSim.Region.Framework.Scenes
662 CreateSceneViewer(); 729 CreateSceneViewer();
663 m_animator = new ScenePresenceAnimator(this); 730 m_animator = new ScenePresenceAnimator(this);
664 } 731 }
665 732
666 private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) : this() 733 private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) : this()
667 { 734 {
668 m_rootRegionHandle = reginfo.RegionHandle; 735 m_rootRegionHandle = reginfo.RegionHandle;
@@ -694,10 +761,7 @@ namespace OpenSim.Region.Framework.Scenes
694 m_reprioritization_timer.AutoReset = false; 761 m_reprioritization_timer.AutoReset = false;
695 762
696 AdjustKnownSeeds(); 763 AdjustKnownSeeds();
697
698 // TODO: I think, this won't send anything, as we are still a child here...
699 Animator.TrySetMovementAnimation("STAND"); 764 Animator.TrySetMovementAnimation("STAND");
700
701 // we created a new ScenePresence (a new child agent) in a fresh region. 765 // we created a new ScenePresence (a new child agent) in a fresh region.
702 // Request info about all the (root) agents in this region 766 // Request info about all the (root) agents in this region
703 // Note: This won't send data *to* other clients in that region (children don't send) 767 // Note: This won't send data *to* other clients in that region (children don't send)
@@ -746,25 +810,47 @@ namespace OpenSim.Region.Framework.Scenes
746 Dir_Vectors[3] = -Vector3.UnitY; //RIGHT 810 Dir_Vectors[3] = -Vector3.UnitY; //RIGHT
747 Dir_Vectors[4] = Vector3.UnitZ; //UP 811 Dir_Vectors[4] = Vector3.UnitZ; //UP
748 Dir_Vectors[5] = -Vector3.UnitZ; //DOWN 812 Dir_Vectors[5] = -Vector3.UnitZ; //DOWN
749 Dir_Vectors[8] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge 813 Dir_Vectors[6] = new Vector3(0.5f, 0f, 0f); //FORWARD_NUDGE
750 Dir_Vectors[6] = Vector3.UnitX*2; //FORWARD 814 Dir_Vectors[7] = new Vector3(-0.5f, 0f, 0f); //BACK_NUDGE
751 Dir_Vectors[7] = -Vector3.UnitX; //BACK 815 Dir_Vectors[8] = new Vector3(0f, 0.5f, 0f); //LEFT_NUDGE
816 Dir_Vectors[9] = new Vector3(0f, -0.5f, 0f); //RIGHT_NUDGE
817 Dir_Vectors[10] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge
752 } 818 }
753 819
754 private Vector3[] GetWalkDirectionVectors() 820 private Vector3[] GetWalkDirectionVectors()
755 { 821 {
756 Vector3[] vector = new Vector3[9]; 822 Vector3[] vector = new Vector3[11];
757 vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD 823 vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD
758 vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK 824 vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK
759 vector[2] = Vector3.UnitY; //LEFT 825 vector[2] = Vector3.UnitY; //LEFT
760 vector[3] = -Vector3.UnitY; //RIGHT 826 vector[3] = -Vector3.UnitY; //RIGHT
761 vector[4] = new Vector3(m_CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP 827 vector[4] = new Vector3(m_CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP
762 vector[5] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN 828 vector[5] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN
763 vector[8] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_Nudge 829 vector[6] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD_NUDGE
764 vector[6] = (new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z) * 2); //FORWARD Nudge 830 vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK_NUDGE
765 vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK Nudge 831 vector[8] = Vector3.UnitY; //LEFT_NUDGE
832 vector[9] = -Vector3.UnitY; //RIGHT_NUDGE
833 vector[10] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_NUDGE
766 return vector; 834 return vector;
767 } 835 }
836
837 private bool[] GetDirectionIsNudge()
838 {
839 bool[] isNudge = new bool[11];
840 isNudge[0] = false; //FORWARD
841 isNudge[1] = false; //BACK
842 isNudge[2] = false; //LEFT
843 isNudge[3] = false; //RIGHT
844 isNudge[4] = false; //UP
845 isNudge[5] = false; //DOWN
846 isNudge[6] = true; //FORWARD_NUDGE
847 isNudge[7] = true; //BACK_NUDGE
848 isNudge[8] = true; //LEFT_NUDGE
849 isNudge[9] = true; //RIGHT_NUDGE
850 isNudge[10] = true; //DOWN_Nudge
851 return isNudge;
852 }
853
768 854
769 #endregion 855 #endregion
770 856
@@ -826,6 +912,54 @@ namespace OpenSim.Region.Framework.Scenes
826 pos.Y = crossedBorder.BorderLine.Z - 1; 912 pos.Y = crossedBorder.BorderLine.Z - 1;
827 } 913 }
828 914
915 //If they're TP'ing in or logging in, we haven't had time to add any known child regions yet.
916 //This has the unfortunate consequence that if somebody is TP'ing who is already a child agent,
917 //they'll bypass the landing point. But I can't think of any decent way of fixing this.
918 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
919 if (land != null)
920 {
921 if (KnownChildRegionHandles.Count == 0)
922 {
923 //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni.
924 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero && UserLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid) && land.LandData.OwnerID != m_uuid)
925 {
926 pos = land.LandData.UserLocation;
927 }
928 }
929
930 land.SendLandUpdateToClient(ControllingClient);
931 }
932
933 if (pos.X < 0 || pos.Y < 0 || pos.Z < 0)
934 {
935 Vector3 emergencyPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128);
936
937 if (pos.X < 0)
938 {
939 emergencyPos.X = (int)Constants.RegionSize + pos.X;
940 if (!(pos.Y < 0))
941 emergencyPos.Y = pos.Y;
942 if (!(pos.Z < 0))
943 emergencyPos.Z = pos.Z;
944 }
945 if (pos.Y < 0)
946 {
947 emergencyPos.Y = (int)Constants.RegionSize + pos.Y;
948 if (!(pos.X < 0))
949 emergencyPos.X = pos.X;
950 if (!(pos.Z < 0))
951 emergencyPos.Z = pos.Z;
952 }
953 if (pos.Z < 0)
954 {
955 emergencyPos.Z = 128;
956 if (!(pos.Y < 0))
957 emergencyPos.Y = pos.Y;
958 if (!(pos.X < 0))
959 emergencyPos.X = pos.X;
960 }
961 }
962
829 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f) 963 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
830 { 964 {
831 m_log.WarnFormat( 965 m_log.WarnFormat(
@@ -954,12 +1088,17 @@ namespace OpenSim.Region.Framework.Scenes
954 { 1088 {
955 if (PhysicsActor != null) 1089 if (PhysicsActor != null)
956 { 1090 {
957 m_physicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; 1091 try
958 m_physicsActor.OnOutOfBounds -= OutOfBoundsCall; 1092 {
959 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); 1093 m_physicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
960 m_physicsActor.UnSubscribeEvents(); 1094 m_physicsActor.OnOutOfBounds -= OutOfBoundsCall;
961 m_physicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; 1095 m_physicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
962 PhysicsActor = null; 1096 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1097 m_physicsActor.UnSubscribeEvents();
1098 PhysicsActor = null;
1099 }
1100 catch
1101 { }
963 } 1102 }
964 } 1103 }
965 1104
@@ -970,9 +1109,10 @@ namespace OpenSim.Region.Framework.Scenes
970 public void Teleport(Vector3 pos) 1109 public void Teleport(Vector3 pos)
971 { 1110 {
972 bool isFlying = false; 1111 bool isFlying = false;
1112
973 if (m_physicsActor != null) 1113 if (m_physicsActor != null)
974 isFlying = m_physicsActor.Flying; 1114 isFlying = m_physicsActor.Flying;
975 1115
976 RemoveFromPhysicalScene(); 1116 RemoveFromPhysicalScene();
977 Velocity = Vector3.Zero; 1117 Velocity = Vector3.Zero;
978 AbsolutePosition = pos; 1118 AbsolutePosition = pos;
@@ -984,6 +1124,7 @@ namespace OpenSim.Region.Framework.Scenes
984 } 1124 }
985 1125
986 SendTerseUpdateToAllClients(); 1126 SendTerseUpdateToAllClients();
1127
987 } 1128 }
988 1129
989 public void TeleportWithMomentum(Vector3 pos) 1130 public void TeleportWithMomentum(Vector3 pos)
@@ -1202,6 +1343,7 @@ namespace OpenSim.Region.Framework.Scenes
1202 m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902"); 1343 m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902");
1203 1344
1204 m_pos = m_LastFinitePos; 1345 m_pos = m_LastFinitePos;
1346
1205 if (!m_pos.IsFinite()) 1347 if (!m_pos.IsFinite())
1206 { 1348 {
1207 m_pos.X = 127f; 1349 m_pos.X = 127f;
@@ -1268,7 +1410,6 @@ namespace OpenSim.Region.Framework.Scenes
1268 m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(m_CameraCenter - posAdjusted), Vector3.Distance(m_CameraCenter, posAdjusted) + 0.3f, RayCastCameraCallback); 1410 m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(m_CameraCenter - posAdjusted), Vector3.Distance(m_CameraCenter, posAdjusted) + 0.3f, RayCastCameraCallback);
1269 } 1411 }
1270 } 1412 }
1271
1272 lock (scriptedcontrols) 1413 lock (scriptedcontrols)
1273 { 1414 {
1274 if (scriptedcontrols.Count > 0) 1415 if (scriptedcontrols.Count > 0)
@@ -1283,6 +1424,9 @@ namespace OpenSim.Region.Framework.Scenes
1283 1424
1284 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0) 1425 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
1285 { 1426 {
1427 m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.
1428 Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
1429
1286 // TODO: This doesn't prevent the user from walking yet. 1430 // TODO: This doesn't prevent the user from walking yet.
1287 // Setting parent ID would fix this, if we knew what value 1431 // Setting parent ID would fix this, if we knew what value
1288 // to use. Or we could add a m_isSitting variable. 1432 // to use. Or we could add a m_isSitting variable.
@@ -1331,12 +1475,20 @@ namespace OpenSim.Region.Framework.Scenes
1331 if (actor.Flying != oldflying) 1475 if (actor.Flying != oldflying)
1332 update_movementflag = true; 1476 update_movementflag = true;
1333 1477
1478 if (m_animator.m_jumping) // add for jumping
1479 update_movementflag = true;
1480
1334 if (q != m_bodyRot) 1481 if (q != m_bodyRot)
1335 { 1482 {
1336 m_bodyRot = q; 1483 m_bodyRot = q;
1337 update_rotation = true; 1484 update_rotation = true;
1338 } 1485 }
1339 1486
1487 //guilty until proven innocent..
1488 bool Nudging = true;
1489 //Basically, if there is at least one non-nudge control then we don't need
1490 //to worry about stopping the avatar
1491
1340 if (m_parentID == 0) 1492 if (m_parentID == 0)
1341 { 1493 {
1342 bool bAllowUpdateMoveToPosition = false; 1494 bool bAllowUpdateMoveToPosition = false;
@@ -1351,9 +1503,12 @@ namespace OpenSim.Region.Framework.Scenes
1351 else 1503 else
1352 dirVectors = Dir_Vectors; 1504 dirVectors = Dir_Vectors;
1353 1505
1354 // The fact that m_movementflag is a byte needs to be fixed 1506 bool[] isNudge = GetDirectionIsNudge();
1355 // it really should be a uint 1507
1356 uint nudgehack = 250; 1508
1509
1510
1511
1357 foreach (Dir_ControlFlags DCF in DIR_CONTROL_FLAGS) 1512 foreach (Dir_ControlFlags DCF in DIR_CONTROL_FLAGS)
1358 { 1513 {
1359 if (((uint)flags & (uint)DCF) != 0) 1514 if (((uint)flags & (uint)DCF) != 0)
@@ -1363,40 +1518,28 @@ namespace OpenSim.Region.Framework.Scenes
1363 try 1518 try
1364 { 1519 {
1365 agent_control_v3 += dirVectors[i]; 1520 agent_control_v3 += dirVectors[i];
1366 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]); 1521 if (isNudge[i] == false)
1522 {
1523 Nudging = false;
1524 }
1367 } 1525 }
1368 catch (IndexOutOfRangeException) 1526 catch (IndexOutOfRangeException)
1369 { 1527 {
1370 // Why did I get this? 1528 // Why did I get this?
1371 } 1529 }
1372 1530
1373 if ((m_movementflag & (byte)(uint)DCF) == 0) 1531 if ((m_movementflag & (uint)DCF) == 0)
1374 { 1532 {
1375 if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE)
1376 {
1377 m_movementflag |= (byte)nudgehack;
1378 }
1379 m_movementflag += (byte)(uint)DCF; 1533 m_movementflag += (byte)(uint)DCF;
1380 update_movementflag = true; 1534 update_movementflag = true;
1381 } 1535 }
1382 } 1536 }
1383 else 1537 else
1384 { 1538 {
1385 if ((m_movementflag & (byte)(uint)DCF) != 0 || 1539 if ((m_movementflag & (uint)DCF) != 0)
1386 ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE)
1387 && ((m_movementflag & (byte)nudgehack) == nudgehack))
1388 ) // This or is for Nudge forward
1389 { 1540 {
1390 m_movementflag -= ((byte)(uint)DCF); 1541 m_movementflag -= (byte)(uint)DCF;
1391
1392 update_movementflag = true; 1542 update_movementflag = true;
1393 /*
1394 if ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE)
1395 && ((m_movementflag & (byte)nudgehack) == nudgehack))
1396 {
1397 m_log.Debug("Removed Hack flag");
1398 }
1399 */
1400 } 1543 }
1401 else 1544 else
1402 { 1545 {
@@ -1405,7 +1548,6 @@ namespace OpenSim.Region.Framework.Scenes
1405 } 1548 }
1406 i++; 1549 i++;
1407 } 1550 }
1408
1409 //Paupaw:Do Proper PID for Autopilot here 1551 //Paupaw:Do Proper PID for Autopilot here
1410 if (bResetMoveToPosition) 1552 if (bResetMoveToPosition)
1411 { 1553 {
@@ -1440,6 +1582,9 @@ namespace OpenSim.Region.Framework.Scenes
1440 // Ignore z component of vector 1582 // Ignore z component of vector
1441 Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f); 1583 Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f);
1442 LocalVectorToTarget2D.Normalize(); 1584 LocalVectorToTarget2D.Normalize();
1585
1586 //We're not nudging
1587 Nudging = false;
1443 agent_control_v3 += LocalVectorToTarget2D; 1588 agent_control_v3 += LocalVectorToTarget2D;
1444 1589
1445 // update avatar movement flags. the avatar coordinate system is as follows: 1590 // update avatar movement flags. the avatar coordinate system is as follows:
@@ -1530,13 +1675,13 @@ namespace OpenSim.Region.Framework.Scenes
1530 // m_log.DebugFormat( 1675 // m_log.DebugFormat(
1531 // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); 1676 // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
1532 1677
1533 AddNewMovement(agent_control_v3, q); 1678 AddNewMovement(agent_control_v3, q, Nudging);
1534 1679
1535 1680
1536 } 1681 }
1537 } 1682 }
1538 1683
1539 if (update_movementflag && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) && (m_parentID == 0) && !SitGround) 1684 if (update_movementflag && !SitGround)
1540 Animator.UpdateMovementAnimations(); 1685 Animator.UpdateMovementAnimations();
1541 1686
1542 m_scene.EventManager.TriggerOnClientMovement(this); 1687 m_scene.EventManager.TriggerOnClientMovement(this);
@@ -1551,7 +1696,6 @@ namespace OpenSim.Region.Framework.Scenes
1551 m_sitAtAutoTarget = false; 1696 m_sitAtAutoTarget = false;
1552 PrimitiveBaseShape proxy = PrimitiveBaseShape.Default; 1697 PrimitiveBaseShape proxy = PrimitiveBaseShape.Default;
1553 //proxy.PCode = (byte)PCode.ParticleSystem; 1698 //proxy.PCode = (byte)PCode.ParticleSystem;
1554
1555 proxyObjectGroup = new SceneObjectGroup(UUID, Pos, Rotation, proxy); 1699 proxyObjectGroup = new SceneObjectGroup(UUID, Pos, Rotation, proxy);
1556 proxyObjectGroup.AttachToScene(m_scene); 1700 proxyObjectGroup.AttachToScene(m_scene);
1557 1701
@@ -1593,7 +1737,7 @@ namespace OpenSim.Region.Framework.Scenes
1593 } 1737 }
1594 m_moveToPositionInProgress = true; 1738 m_moveToPositionInProgress = true;
1595 m_moveToPositionTarget = new Vector3(locx, locy, locz); 1739 m_moveToPositionTarget = new Vector3(locx, locy, locz);
1596 } 1740 }
1597 catch (Exception ex) 1741 catch (Exception ex)
1598 { 1742 {
1599 //Why did I get this error? 1743 //Why did I get this error?
@@ -1615,7 +1759,7 @@ namespace OpenSim.Region.Framework.Scenes
1615 Velocity = Vector3.Zero; 1759 Velocity = Vector3.Zero;
1616 SendFullUpdateToAllClients(); 1760 SendFullUpdateToAllClients();
1617 1761
1618 //HandleAgentSit(ControllingClient, m_requestedSitTargetUUID); 1762 HandleAgentSit(ControllingClient, m_requestedSitTargetUUID); //KF ??
1619 } 1763 }
1620 //ControllingClient.SendSitResponse(m_requestedSitTargetID, m_requestedSitOffset, Quaternion.Identity, false, Vector3.Zero, Vector3.Zero, false); 1764 //ControllingClient.SendSitResponse(m_requestedSitTargetID, m_requestedSitOffset, Quaternion.Identity, false, Vector3.Zero, Vector3.Zero, false);
1621 m_requestedSitTargetUUID = UUID.Zero; 1765 m_requestedSitTargetUUID = UUID.Zero;
@@ -1652,42 +1796,77 @@ namespace OpenSim.Region.Framework.Scenes
1652 1796
1653 if (m_parentID != 0) 1797 if (m_parentID != 0)
1654 { 1798 {
1655 m_log.Debug("StandupCode Executed"); 1799 SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
1656 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
1657 if (part != null) 1800 if (part != null)
1658 { 1801 {
1802 part.TaskInventory.LockItemsForRead(true);
1659 TaskInventoryDictionary taskIDict = part.TaskInventory; 1803 TaskInventoryDictionary taskIDict = part.TaskInventory;
1660 if (taskIDict != null) 1804 if (taskIDict != null)
1661 { 1805 {
1662 lock (taskIDict) 1806 foreach (UUID taskID in taskIDict.Keys)
1663 { 1807 {
1664 foreach (UUID taskID in taskIDict.Keys) 1808 UnRegisterControlEventsToScript(LocalId, taskID);
1665 { 1809 taskIDict[taskID].PermsMask &= ~(
1666 UnRegisterControlEventsToScript(LocalId, taskID); 1810 2048 | //PERMISSION_CONTROL_CAMERA
1667 taskIDict[taskID].PermsMask &= ~( 1811 4); // PERMISSION_TAKE_CONTROLS
1668 2048 | //PERMISSION_CONTROL_CAMERA
1669 4); // PERMISSION_TAKE_CONTROLS
1670 }
1671 } 1812 }
1672
1673 } 1813 }
1814 part.TaskInventory.LockItemsForRead(false);
1674 // Reset sit target. 1815 // Reset sit target.
1675 if (part.GetAvatarOnSitTarget() == UUID) 1816 if (part.GetAvatarOnSitTarget() == UUID)
1676 part.SetAvatarOnSitTarget(UUID.Zero); 1817 part.SetAvatarOnSitTarget(UUID.Zero);
1677
1678 m_parentPosition = part.GetWorldPosition(); 1818 m_parentPosition = part.GetWorldPosition();
1679 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1819 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1680 } 1820 }
1821 // part.GetWorldRotation() is the rotation of the object being sat on
1822 // Rotation is the sittiing Av's rotation
1823
1824 Quaternion partRot;
1825// if (part.LinkNum == 1)
1826// { // Root prim of linkset
1827// partRot = part.ParentGroup.RootPart.RotationOffset;
1828// }
1829// else
1830// { // single or child prim
1831
1832// }
1833 if (part == null) //CW: Part may be gone. llDie() for example.
1834 {
1835 partRot = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
1836 }
1837 else
1838 {
1839 partRot = part.GetWorldRotation();
1840 }
1841
1842 Quaternion partIRot = Quaternion.Inverse(partRot);
1681 1843
1844 Quaternion avatarRot = Quaternion.Inverse(Quaternion.Inverse(Rotation) * partIRot); // world or. of the av
1845 Vector3 avStandUp = new Vector3(1.0f, 0f, 0f) * avatarRot; // 1M infront of av
1846
1847
1682 if (m_physicsActor == null) 1848 if (m_physicsActor == null)
1683 { 1849 {
1684 AddToPhysicalScene(false); 1850 AddToPhysicalScene(false);
1685 } 1851 }
1686 1852 //CW: If the part isn't null then we can set the current position
1687 m_pos += m_parentPosition + new Vector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 1853 if (part != null)
1688 m_parentPosition = Vector3.Zero; 1854 {
1689 1855 Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + ((m_pos - part.OffsetPosition) * partRot); // + av sit offset!
1690 m_parentID = 0; 1856 AbsolutePosition = avWorldStandUp; //KF: Fix stand up.
1857 part.IsOccupied = false;
1858 part.ParentGroup.DeleteAvatar(ControllingClient.AgentId);
1859 }
1860 else
1861 {
1862 //CW: Since the part doesn't exist, a coarse standup position isn't an issue
1863 AbsolutePosition = m_lastWorldPosition;
1864 }
1865
1866 m_parentPosition = Vector3.Zero;
1867 m_parentID = 0;
1868 m_linkedPrim = UUID.Zero;
1869 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
1691 SendFullUpdateToAllClients(); 1870 SendFullUpdateToAllClients();
1692 m_requestedSitTargetID = 0; 1871 m_requestedSitTargetID = 0;
1693 if (m_physicsActor != null && m_appearance != null) 1872 if (m_physicsActor != null && m_appearance != null)
@@ -1696,7 +1875,6 @@ namespace OpenSim.Region.Framework.Scenes
1696 SetHeight(m_appearance.AvatarHeight); 1875 SetHeight(m_appearance.AvatarHeight);
1697 } 1876 }
1698 } 1877 }
1699
1700 Animator.TrySetMovementAnimation("STAND"); 1878 Animator.TrySetMovementAnimation("STAND");
1701 } 1879 }
1702 1880
@@ -1727,13 +1905,9 @@ namespace OpenSim.Region.Framework.Scenes
1727 Vector3 avSitOffSet = part.SitTargetPosition; 1905 Vector3 avSitOffSet = part.SitTargetPosition;
1728 Quaternion avSitOrientation = part.SitTargetOrientation; 1906 Quaternion avSitOrientation = part.SitTargetOrientation;
1729 UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1907 UUID avOnTargetAlready = part.GetAvatarOnSitTarget();
1730 1908 bool SitTargetOccupied = (avOnTargetAlready != UUID.Zero);
1731 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 1909 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored.
1732 bool SitTargetisSet = 1910 if (SitTargetisSet && !SitTargetOccupied)
1733 (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f && avSitOrientation.W == 1f &&
1734 avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f));
1735
1736 if (SitTargetisSet && SitTargetUnOccupied)
1737 { 1911 {
1738 //switch the target to this prim 1912 //switch the target to this prim
1739 return part; 1913 return part;
@@ -1747,84 +1921,164 @@ namespace OpenSim.Region.Framework.Scenes
1747 private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation) 1921 private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation)
1748 { 1922 {
1749 bool autopilot = true; 1923 bool autopilot = true;
1924 Vector3 autopilotTarget = new Vector3();
1925 Quaternion sitOrientation = Quaternion.Identity;
1750 Vector3 pos = new Vector3(); 1926 Vector3 pos = new Vector3();
1751 Quaternion sitOrientation = pSitOrientation;
1752 Vector3 cameraEyeOffset = Vector3.Zero; 1927 Vector3 cameraEyeOffset = Vector3.Zero;
1753 Vector3 cameraAtOffset = Vector3.Zero; 1928 Vector3 cameraAtOffset = Vector3.Zero;
1754 bool forceMouselook = false; 1929 bool forceMouselook = false;
1755 1930
1756 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 1931 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
1757 SceneObjectPart part = FindNextAvailableSitTarget(targetID); 1932 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
1758 if (part != null) 1933 if (part == null) return;
1759 { 1934
1760 // TODO: determine position to sit at based on scene geometry; don't trust offset from client 1935 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
1761 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it 1936 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
1762 1937
1763 // Is a sit target available? 1938 // part is the prim to sit on
1764 Vector3 avSitOffSet = part.SitTargetPosition; 1939 // offset is the world-ref vector distance from that prim center to the click-spot
1765 Quaternion avSitOrientation = part.SitTargetOrientation; 1940 // UUID is the UUID of the Avatar doing the clicking
1766 UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1941
1767 1942 m_avInitialPos = AbsolutePosition; // saved to calculate unscripted sit rotation
1768 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 1943
1769 bool SitTargetisSet = 1944 // Is a sit target available?
1770 (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f && 1945 Vector3 avSitOffSet = part.SitTargetPosition;
1771 ( 1946 Quaternion avSitOrientation = part.SitTargetOrientation;
1772 avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 1f // Valid Zero Rotation quaternion 1947
1773 || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 1f && avSitOrientation.W == 0f // W-Z Mapping was invalid at one point 1948 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored.
1774 || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 0f // Invalid Quaternion 1949 // Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
1775 ) 1950 Quaternion partRot;
1776 )); 1951// if (part.LinkNum == 1)
1777 1952// { // Root prim of linkset
1778 if (SitTargetisSet && SitTargetUnOccupied) 1953// partRot = part.ParentGroup.RootPart.RotationOffset;
1779 { 1954// }
1780 part.SetAvatarOnSitTarget(UUID); 1955// else
1781 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); 1956// { // single or child prim
1782 sitOrientation = avSitOrientation; 1957 partRot = part.GetWorldRotation();
1783 autopilot = false; 1958// }
1784 } 1959 Quaternion partIRot = Quaternion.Inverse(partRot);
1785 1960//Console.WriteLine("SendSitResponse offset=" + offset + " Occup=" + part.IsOccupied + " TargSet=" + SitTargetisSet);
1786 pos = part.AbsolutePosition + offset; 1961 // Sit analysis rewritten by KF 091125
1787 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1) 1962 if (SitTargetisSet) // scipted sit
1788 //{ 1963 {
1789 // offset = pos; 1964 if (!part.IsOccupied)
1790 //autopilot = false; 1965 {
1791 //} 1966//Console.WriteLine("Scripted, unoccupied");
1792 if (m_physicsActor != null) 1967 part.SetAvatarOnSitTarget(UUID); // set that Av will be on it
1793 { 1968 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); // change ofset to the scripted one
1794 // If we're not using the client autopilot, we're immediately warping the avatar to the location 1969
1795 // We can remove the physicsActor until they stand up. 1970 Quaternion nrot = avSitOrientation;
1796 m_sitAvatarHeight = m_physicsActor.Size.Z; 1971 if (!part.IsRoot)
1797
1798 if (autopilot)
1799 { 1972 {
1800 if (Util.GetDistanceTo(AbsolutePosition, pos) < 4.5) 1973 nrot = part.RotationOffset * avSitOrientation;
1801 {
1802 autopilot = false;
1803
1804 RemoveFromPhysicalScene();
1805 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
1806 }
1807 } 1974 }
1808 else 1975 sitOrientation = nrot; // Change rotatione to the scripted one
1976 OffsetRotation = nrot;
1977 autopilot = false; // Jump direct to scripted llSitPos()
1978 }
1979 else
1980 {
1981//Console.WriteLine("Scripted, occupied");
1982 return;
1983 }
1984 }
1985 else // Not Scripted
1986 {
1987 if ( (Math.Abs(offset.X) > 0.5f) || (Math.Abs(offset.Y) > 0.5f) )
1988 {
1989 // large prim & offset, ignore if other Avs sitting
1990// offset.Z -= 0.05f;
1991 m_avUnscriptedSitPos = offset * partIRot; // (non-zero) sit where clicked
1992 autopilotTarget = part.AbsolutePosition + offset; // World location of clicked point
1993
1994//Console.WriteLine(" offset ={0}", offset);
1995//Console.WriteLine(" UnscriptedSitPos={0}", m_avUnscriptedSitPos);
1996//Console.WriteLine(" autopilotTarget={0}", autopilotTarget);
1997
1998 }
1999 else // small offset
2000 {
2001//Console.WriteLine("Small offset");
2002 if (!part.IsOccupied)
2003 {
2004 m_avUnscriptedSitPos = Vector3.Zero; // Zero = Sit on prim center
2005 autopilotTarget = part.AbsolutePosition;
2006//Console.WriteLine("UsSmall autopilotTarget={0}", autopilotTarget);
2007 }
2008 else return; // occupied small
2009 } // end large/small
2010 } // end Scripted/not
2011 cameraAtOffset = part.GetCameraAtOffset();
2012 cameraEyeOffset = part.GetCameraEyeOffset();
2013 forceMouselook = part.GetForceMouselook();
2014 if(cameraAtOffset == Vector3.Zero) cameraAtOffset = new Vector3(0f, 0f, 0.1f); //
2015 if(cameraEyeOffset == Vector3.Zero) cameraEyeOffset = new Vector3(0f, 0f, 0.1f); //
2016
2017 if (m_physicsActor != null)
2018 {
2019 // If we're not using the client autopilot, we're immediately warping the avatar to the location
2020 // We can remove the physicsActor until they stand up.
2021 m_sitAvatarHeight = m_physicsActor.Size.Z;
2022 if (autopilot)
2023 { // its not a scripted sit
2024// if (Util.GetDistanceTo(AbsolutePosition, autopilotTarget) < 4.5)
2025 if( (Math.Abs(AbsolutePosition.X - autopilotTarget.X) < 256.0f) && (Math.Abs(AbsolutePosition.Y - autopilotTarget.Y) < 256.0f) )
1809 { 2026 {
2027 autopilot = false; // close enough
2028 m_lastWorldPosition = m_pos; /* CW - This give us a position to return the avatar to if the part is killed before standup.
2029 Not using the part's position because returning the AV to the last known standing
2030 position is likely to be more friendly, isn't it? */
1810 RemoveFromPhysicalScene(); 2031 RemoveFromPhysicalScene();
1811 } 2032 Velocity = Vector3.Zero;
2033 AbsolutePosition = autopilotTarget + new Vector3(0.0f, 0.0f, (m_sitAvatarHeight / 2.0f)); // Warp av to over sit target
2034 } // else the autopilot will get us close
2035 }
2036 else
2037 { // its a scripted sit
2038 m_lastWorldPosition = part.AbsolutePosition; /* CW - This give us a position to return the avatar to if the part is killed before standup.
2039 I *am* using the part's position this time because we have no real idea how far away
2040 the avatar is from the sit target. */
2041 RemoveFromPhysicalScene();
2042 Velocity = Vector3.Zero;
1812 } 2043 }
1813
1814 cameraAtOffset = part.GetCameraAtOffset();
1815 cameraEyeOffset = part.GetCameraEyeOffset();
1816 forceMouselook = part.GetForceMouselook();
1817 } 2044 }
2045 else return; // physactor is null!
1818 2046
1819 ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook); 2047 Vector3 offsetr; // = offset * partIRot;
1820 m_requestedSitTargetUUID = targetID; 2048 // KF: In a linkset, offsetr needs to be relative to the group root! 091208
2049 // offsetr = (part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) + (offset * partIRot);
2050 // if (part.LinkNum < 2) 091216 All this was necessary because of the GetWorldRotation error.
2051 // { // Single, or Root prim of linkset, target is ClickOffset * RootRot
2052 //offsetr = offset * partIRot;
2053//
2054 // else
2055 // { // Child prim, offset is (ChildOffset * RootRot) + (ClickOffset * ChildRot)
2056 // offsetr = //(part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) +
2057 // (offset * partRot);
2058 // }
2059
2060//Console.WriteLine(" ");
2061//Console.WriteLine("link number ={0}", part.LinkNum);
2062//Console.WriteLine("Prim offset ={0}", part.OffsetPosition );
2063//Console.WriteLine("Root Rotate ={0}", part.ParentGroup.RootPart.RotationOffset);
2064//Console.WriteLine("Click offst ={0}", offset);
2065//Console.WriteLine("Prim Rotate ={0}", part.GetWorldRotation());
2066//Console.WriteLine("offsetr ={0}", offsetr);
2067//Console.WriteLine("Camera At ={0}", cameraAtOffset);
2068//Console.WriteLine("Camera Eye ={0}", cameraEyeOffset);
2069
2070 //NOTE: SendSitResponse should be relative to the GROUP *NOT* THE PRIM if we're sitting on a child
2071 ControllingClient.SendSitResponse(part.ParentGroup.UUID, ((offset * part.RotationOffset) + part.OffsetPosition), sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);
2072
2073 m_requestedSitTargetUUID = part.UUID; //KF: Correct autopilot target
1821 // This calls HandleAgentSit twice, once from here, and the client calls 2074 // This calls HandleAgentSit twice, once from here, and the client calls
1822 // HandleAgentSit itself after it gets to the location 2075 // HandleAgentSit itself after it gets to the location
1823 // It doesn't get to the location until we've moved them there though 2076 // It doesn't get to the location until we've moved them there though
1824 // which happens in HandleAgentSit :P 2077 // which happens in HandleAgentSit :P
1825 m_autopilotMoving = autopilot; 2078 m_autopilotMoving = autopilot;
1826 m_autoPilotTarget = pos; 2079 m_autoPilotTarget = autopilotTarget;
1827 m_sitAtAutoTarget = autopilot; 2080 m_sitAtAutoTarget = autopilot;
2081 m_initialSitTarget = autopilotTarget;
1828 if (!autopilot) 2082 if (!autopilot)
1829 HandleAgentSit(remoteClient, UUID); 2083 HandleAgentSit(remoteClient, UUID);
1830 } 2084 }
@@ -2119,47 +2373,130 @@ namespace OpenSim.Region.Framework.Scenes
2119 { 2373 {
2120 if (part != null) 2374 if (part != null)
2121 { 2375 {
2376//Console.WriteLine("Link #{0}, Rot {1}", part.LinkNum, part.GetWorldRotation());
2122 if (part.GetAvatarOnSitTarget() == UUID) 2377 if (part.GetAvatarOnSitTarget() == UUID)
2123 { 2378 {
2379//Console.WriteLine("Scripted Sit");
2380 // Scripted sit
2124 Vector3 sitTargetPos = part.SitTargetPosition; 2381 Vector3 sitTargetPos = part.SitTargetPosition;
2125 Quaternion sitTargetOrient = part.SitTargetOrientation; 2382 Quaternion sitTargetOrient = part.SitTargetOrientation;
2126
2127 //Quaternion vq = new Quaternion(sitTargetPos.X, sitTargetPos.Y+0.2f, sitTargetPos.Z+0.2f, 0);
2128 //Quaternion nq = new Quaternion(-sitTargetOrient.X, -sitTargetOrient.Y, -sitTargetOrient.Z, sitTargetOrient.w);
2129
2130 //Quaternion result = (sitTargetOrient * vq) * nq;
2131
2132 m_pos = new Vector3(sitTargetPos.X, sitTargetPos.Y, sitTargetPos.Z); 2383 m_pos = new Vector3(sitTargetPos.X, sitTargetPos.Y, sitTargetPos.Z);
2133 m_pos += SIT_TARGET_ADJUSTMENT; 2384 m_pos += SIT_TARGET_ADJUSTMENT;
2385 if (!part.IsRoot)
2386 {
2387 m_pos *= part.RotationOffset;
2388 }
2134 m_bodyRot = sitTargetOrient; 2389 m_bodyRot = sitTargetOrient;
2135 //Rotation = sitTargetOrient;
2136 m_parentPosition = part.AbsolutePosition; 2390 m_parentPosition = part.AbsolutePosition;
2137 2391 part.IsOccupied = true;
2138 //SendTerseUpdateToAllClients(); 2392 part.ParentGroup.AddAvatar(agentID);
2139 } 2393 }
2140 else 2394 else
2141 { 2395 {
2142 m_pos -= part.AbsolutePosition; 2396 // if m_avUnscriptedSitPos is zero then Av sits above center
2397 // Else Av sits at m_avUnscriptedSitPos
2398
2399 // Non-scripted sit by Kitto Flora 21Nov09
2400 // Calculate angle of line from prim to Av
2401 Quaternion partIRot;
2402// if (part.LinkNum == 1)
2403// { // Root prim of linkset
2404// partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
2405// }
2406// else
2407// { // single or child prim
2408 partIRot = Quaternion.Inverse(part.GetWorldRotation());
2409// }
2410 Vector3 sitTargetPos= part.AbsolutePosition + m_avUnscriptedSitPos;
2411 float y_diff = (m_avInitialPos.Y - sitTargetPos.Y);
2412 float x_diff = ( m_avInitialPos.X - sitTargetPos.X);
2413 if(Math.Abs(x_diff) < 0.001f) x_diff = 0.001f; // avoid div by 0
2414 if(Math.Abs(y_diff) < 0.001f) y_diff = 0.001f; // avoid pol flip at 0
2415 float sit_angle = (float)Math.Atan2( (double)y_diff, (double)x_diff);
2416 // NOTE: when sitting m_ pos and m_bodyRot are *relative* to the prim location/rotation, not 'World'.
2417 // Av sits at world euler <0,0, z>, translated by part rotation
2418 m_bodyRot = partIRot * Quaternion.CreateFromEulers(0f, 0f, sit_angle); // sit at 0,0,inv-click
2419
2143 m_parentPosition = part.AbsolutePosition; 2420 m_parentPosition = part.AbsolutePosition;
2144 } 2421 part.IsOccupied = true;
2422 part.ParentGroup.AddAvatar(agentID);
2423 m_pos = new Vector3(0f, 0f, 0.05f) + // corrections to get Sit Animation
2424 (new Vector3(0.0f, 0f, 0.61f) * partIRot) + // located on center
2425 (new Vector3(0.34f, 0f, 0.0f) * m_bodyRot) +
2426 m_avUnscriptedSitPos; // adds click offset, if any
2427 //Set up raytrace to find top surface of prim
2428 Vector3 size = part.Scale;
2429 float mag = 2.0f; // 0.1f + (float)Math.Sqrt((size.X * size.X) + (size.Y * size.Y) + (size.Z * size.Z));
2430 Vector3 start = part.AbsolutePosition + new Vector3(0f, 0f, mag);
2431 Vector3 down = new Vector3(0f, 0f, -1f);
2432//Console.WriteLine("st={0} do={1} ma={2}", start, down, mag);
2433 m_scene.PhysicsScene.RaycastWorld(
2434 start, // Vector3 position,
2435 down, // Vector3 direction,
2436 mag, // float length,
2437 SitAltitudeCallback); // retMethod
2438 } // end scripted/not
2145 } 2439 }
2146 else 2440 else // no Av
2147 { 2441 {
2148 return; 2442 return;
2149 } 2443 }
2150 } 2444 }
2151 m_parentID = m_requestedSitTargetID;
2152 2445
2446 //We want our offsets to reference the root prim, not the child we may have sat on
2447 if (!part.IsRoot)
2448 {
2449 m_parentID = part.ParentGroup.RootPart.LocalId;
2450 m_pos += part.OffsetPosition;
2451 }
2452 else
2453 {
2454 m_parentID = m_requestedSitTargetID;
2455 }
2456
2457 m_linkedPrim = part.UUID;
2458 if (part.GetAvatarOnSitTarget() != UUID)
2459 {
2460 m_offsetRotation = m_offsetRotation / part.RotationOffset;
2461 }
2153 Velocity = Vector3.Zero; 2462 Velocity = Vector3.Zero;
2154 RemoveFromPhysicalScene(); 2463 RemoveFromPhysicalScene();
2155
2156 Animator.TrySetMovementAnimation(sitAnimation); 2464 Animator.TrySetMovementAnimation(sitAnimation);
2157 SendFullUpdateToAllClients(); 2465 SendFullUpdateToAllClients();
2158 // This may seem stupid, but Our Full updates don't send avatar rotation :P 2466 SendTerseUpdateToAllClients();
2159 // So we're also sending a terse update (which has avatar rotation)
2160 // [Update] We do now.
2161 //SendTerseUpdateToAllClients();
2162 } 2467 }
2468
2469 public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal)
2470 {
2471 // KF: 091202 There appears to be a bug in Prim Edit Size - the process sometimes make a prim that RayTrace no longer
2472 // sees. Take/re-rez, or sim restart corrects the condition. Result of bug is incorrect sit height.
2473 if(hitYN)
2474 {
2475 // m_pos = Av offset from prim center to make look like on center
2476 // m_parentPosition = Actual center pos of prim
2477 // collisionPoint = spot on prim where we want to sit
2478 // collisionPoint.Z = global sit surface height
2479 SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
2480 Quaternion partIRot;
2481// if (part.LinkNum == 1)
2482/// { // Root prim of linkset
2483// partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
2484// }
2485// else
2486// { // single or child prim
2487 partIRot = Quaternion.Inverse(part.GetWorldRotation());
2488// }
2489 if (m_initialSitTarget != null)
2490 {
2491 float offZ = collisionPoint.Z - m_initialSitTarget.Z;
2492 Vector3 offset = new Vector3(0.0f, 0.0f, offZ) * partIRot; // Altitude correction
2493 //Console.WriteLine("sitPoint={0}, offset={1}", sitPoint, offset);
2494 m_pos += offset;
2495 // ControllingClient.SendClearFollowCamProperties(part.UUID);
2496 }
2497
2498 }
2499 } // End SitAltitudeCallback KF.
2163 2500
2164 /// <summary> 2501 /// <summary>
2165 /// Event handler for the 'Always run' setting on the client 2502 /// Event handler for the 'Always run' setting on the client
@@ -2189,7 +2526,7 @@ namespace OpenSim.Region.Framework.Scenes
2189 /// </summary> 2526 /// </summary>
2190 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> 2527 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param>
2191 /// <param name="rotation">The direction in which this avatar should now face. 2528 /// <param name="rotation">The direction in which this avatar should now face.
2192 public void AddNewMovement(Vector3 vec, Quaternion rotation) 2529 public void AddNewMovement(Vector3 vec, Quaternion rotation, bool Nudging)
2193 { 2530 {
2194 if (m_isChildAgent) 2531 if (m_isChildAgent)
2195 { 2532 {
@@ -2230,15 +2567,26 @@ namespace OpenSim.Region.Framework.Scenes
2230 Rotation = rotation; 2567 Rotation = rotation;
2231 Vector3 direc = vec * rotation; 2568 Vector3 direc = vec * rotation;
2232 direc.Normalize(); 2569 direc.Normalize();
2570 PhysicsActor actor = m_physicsActor;
2571
2572 if (actor.Flying != m_flyingOld) // add for fly velocity control
2573 {
2574 m_flyingOld = actor.Flying; // add for fly velocity control
2575 if (!actor.Flying) m_wasFlying = true; // add for fly velocity control
2576 }
2577
2578 if (m_physicsActor.IsColliding == true) m_wasFlying = false; // add for fly velocity control
2579
2580 if ((vec.Z == 0f) && !actor.Flying) direc.Z = 0f; // Prevent camera WASD up.
2233 2581
2234 direc *= 0.03f * 128f * m_speedModifier; 2582 direc *= 0.03f * 128f * m_speedModifier;
2235 2583
2236 PhysicsActor actor = m_physicsActor;
2237 if (actor != null) 2584 if (actor != null)
2238 { 2585 {
2239 if (actor.Flying) 2586 if (actor.Flying)
2240 { 2587 {
2241 direc *= 4.0f; 2588// rm speed mod direc *= 4.0f;
2589 direc *= 5.2f; // for speed mod
2242 //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); 2590 //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
2243 //bool colliding = (m_physicsActor.IsColliding==true); 2591 //bool colliding = (m_physicsActor.IsColliding==true);
2244 //if (controlland) 2592 //if (controlland)
@@ -2251,22 +2599,34 @@ namespace OpenSim.Region.Framework.Scenes
2251 // m_log.Info("[AGENT]: Stop FLying"); 2599 // m_log.Info("[AGENT]: Stop FLying");
2252 //} 2600 //}
2253 } 2601 }
2602 if (Animator.m_falling && m_wasFlying) // if falling from flying, disable motion add
2603 {
2604 direc *= 0.0f;
2605 }
2606 /* This jumping section removed to SPA
2254 else if (!actor.Flying && actor.IsColliding) 2607 else if (!actor.Flying && actor.IsColliding)
2255 { 2608 {
2256 if (direc.Z > 2.0f) 2609 if (direc.Z > 2.0f)
2257 { 2610 {
2258 direc.Z *= 3.0f; 2611 if(m_animator.m_animTickJump == -1)
2259 2612 {
2260 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. 2613 direc.Z *= 3.0f; // jump
2261 Animator.TrySetMovementAnimation("PREJUMP"); 2614 }
2262 Animator.TrySetMovementAnimation("JUMP"); 2615 else
2616 {
2617 direc.Z *= 0.1f; // prejump
2618 }
2619 / * Animations are controlled via GetMovementAnimation() in ScenePresenceAnimator.cs
2620 Animator.TrySetMovementAnimation("PREJUMP");
2621 Animator.TrySetMovementAnimation("JUMP");
2622 * /
2263 } 2623 }
2264 } 2624 } */
2265 } 2625 }
2266 2626
2267 // TODO: Add the force instead of only setting it to support multiple forces per frame? 2627 // TODO: Add the force instead of only setting it to support multiple forces per frame?
2268 m_forceToApply = direc; 2628 m_forceToApply = direc;
2269 2629 m_isNudging = Nudging;
2270 m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); 2630 m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
2271 } 2631 }
2272 2632
@@ -2281,7 +2641,7 @@ namespace OpenSim.Region.Framework.Scenes
2281 const float POSITION_TOLERANCE = 0.05f; 2641 const float POSITION_TOLERANCE = 0.05f;
2282 //const int TIME_MS_TOLERANCE = 3000; 2642 //const int TIME_MS_TOLERANCE = 3000;
2283 2643
2284 SendPrimUpdates(); 2644
2285 2645
2286 if (m_isChildAgent == false) 2646 if (m_isChildAgent == false)
2287 { 2647 {
@@ -2311,6 +2671,9 @@ namespace OpenSim.Region.Framework.Scenes
2311 CheckForBorderCrossing(); 2671 CheckForBorderCrossing();
2312 CheckForSignificantMovement(); // sends update to the modules. 2672 CheckForSignificantMovement(); // sends update to the modules.
2313 } 2673 }
2674
2675 //Sending prim updates AFTER the avatar terse updates are sent
2676 SendPrimUpdates();
2314 } 2677 }
2315 2678
2316 #endregion 2679 #endregion
@@ -3058,6 +3421,7 @@ namespace OpenSim.Region.Framework.Scenes
3058 m_callbackURI = cAgent.CallbackURI; 3421 m_callbackURI = cAgent.CallbackURI;
3059 3422
3060 m_pos = cAgent.Position; 3423 m_pos = cAgent.Position;
3424
3061 m_velocity = cAgent.Velocity; 3425 m_velocity = cAgent.Velocity;
3062 m_CameraCenter = cAgent.Center; 3426 m_CameraCenter = cAgent.Center;
3063 m_CameraAtAxis = cAgent.AtAxis; 3427 m_CameraAtAxis = cAgent.AtAxis;
@@ -3176,17 +3540,46 @@ namespace OpenSim.Region.Framework.Scenes
3176 /// </summary> 3540 /// </summary>
3177 public override void UpdateMovement() 3541 public override void UpdateMovement()
3178 { 3542 {
3179 if (m_forceToApply.HasValue) 3543 if (Animator!=null) // add for jumping
3180 { 3544 { // add for jumping
3181 Vector3 force = m_forceToApply.Value; 3545 // if (!m_animator.m_jumping) // add for jumping
3546 // { // add for jumping
3182 3547
3183 m_updateflag = true; 3548 if (m_forceToApply.HasValue) // this section realigned
3184// movementvector = force; 3549 {
3185 Velocity = force;
3186 3550
3187 m_forceToApply = null; 3551 Vector3 force = m_forceToApply.Value;
3188 } 3552 m_updateflag = true;
3189 } 3553if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for jumping
3554 Velocity = force;
3555//Console.WriteLine("UM1 {0}", Velocity);
3556 m_forceToApply = null;
3557 }
3558 else
3559 {
3560 if (m_isNudging)
3561 {
3562 Vector3 force = Vector3.Zero;
3563
3564 m_updateflag = true;
3565if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for jumping
3566 Velocity = force;
3567//Console.WriteLine("UM2 {0}", Velocity);
3568 m_isNudging = false;
3569 m_updateCount = UPDATE_COUNT; //KF: Update anims to pickup "STAND"
3570 }
3571 else // add for jumping
3572 { // add for jumping
3573 Vector3 force = Vector3.Zero; // add for jumping
3574if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for jumping
3575//Console.WriteLine("UM3 {0}", Velocity);
3576 Velocity = force; // add for jumping
3577 }
3578
3579 }
3580 // } // end realign
3581 } // add for jumping
3582 } // add for jumping
3190 3583
3191 /// <summary> 3584 /// <summary>
3192 /// Adds a physical representation of the avatar to the Physics plugin 3585 /// Adds a physical representation of the avatar to the Physics plugin
@@ -3200,10 +3593,8 @@ namespace OpenSim.Region.Framework.Scenes
3200 3593
3201 Vector3 pVec = AbsolutePosition; 3594 Vector3 pVec = AbsolutePosition;
3202 3595
3203 // Old bug where the height was in centimeters instead of meters
3204 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, 3596 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec,
3205 new Vector3(0f, 0f, m_appearance.AvatarHeight), isFlying); 3597 new Vector3(0f, 0f, m_appearance.AvatarHeight), isFlying);
3206
3207 scene.AddPhysicsActorTaint(m_physicsActor); 3598 scene.AddPhysicsActorTaint(m_physicsActor);
3208 //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3599 //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
3209 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3600 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
@@ -3227,18 +3618,29 @@ namespace OpenSim.Region.Framework.Scenes
3227 { 3618 {
3228 if (e == null) 3619 if (e == null)
3229 return; 3620 return;
3230 3621
3231 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) 3622 // The Physics Scene will send (spam!) updates every 500 ms grep: m_physicsActor.SubscribeEvents(
3232 // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
3233 // as of this comment the interval is set in AddToPhysicalScene 3623 // as of this comment the interval is set in AddToPhysicalScene
3234 if (Animator!=null) 3624 if (Animator!=null)
3235 Animator.UpdateMovementAnimations(); 3625 {
3626 if (m_updateCount > 0) //KF: DO NOT call UpdateMovementAnimations outside of the m_updateCount wrapper,
3627 { // else its will lock out other animation changes, like ground sit.
3628 Animator.UpdateMovementAnimations();
3629 m_updateCount--;
3630 }
3631 }
3236 3632
3237 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 3633 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3238 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 3634 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3239 3635
3240 CollisionPlane = Vector4.UnitW; 3636 CollisionPlane = Vector4.UnitW;
3241 3637
3638 if (m_lastColCount != coldata.Count)
3639 {
3640 m_updateCount = UPDATE_COUNT;
3641 m_lastColCount = coldata.Count;
3642 }
3643
3242 if (coldata.Count != 0 && Animator != null) 3644 if (coldata.Count != 0 && Animator != null)
3243 { 3645 {
3244 switch (Animator.CurrentMovementAnimation) 3646 switch (Animator.CurrentMovementAnimation)
@@ -3268,6 +3670,148 @@ namespace OpenSim.Region.Framework.Scenes
3268 } 3670 }
3269 } 3671 }
3270 3672
3673 List<uint> thisHitColliders = new List<uint>();
3674 List<uint> endedColliders = new List<uint>();
3675 List<uint> startedColliders = new List<uint>();
3676
3677 foreach (uint localid in coldata.Keys)
3678 {
3679 thisHitColliders.Add(localid);
3680 if (!m_lastColliders.Contains(localid))
3681 {
3682 startedColliders.Add(localid);
3683 }
3684 //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
3685 }
3686
3687 // calculate things that ended colliding
3688 foreach (uint localID in m_lastColliders)
3689 {
3690 if (!thisHitColliders.Contains(localID))
3691 {
3692 endedColliders.Add(localID);
3693 }
3694 }
3695 //add the items that started colliding this time to the last colliders list.
3696 foreach (uint localID in startedColliders)
3697 {
3698 m_lastColliders.Add(localID);
3699 }
3700 // remove things that ended colliding from the last colliders list
3701 foreach (uint localID in endedColliders)
3702 {
3703 m_lastColliders.Remove(localID);
3704 }
3705
3706 // do event notification
3707 if (startedColliders.Count > 0)
3708 {
3709 ColliderArgs StartCollidingMessage = new ColliderArgs();
3710 List<DetectedObject> colliding = new List<DetectedObject>();
3711 foreach (uint localId in startedColliders)
3712 {
3713 if (localId == 0)
3714 continue;
3715
3716 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
3717 string data = "";
3718 if (obj != null)
3719 {
3720 DetectedObject detobj = new DetectedObject();
3721 detobj.keyUUID = obj.UUID;
3722 detobj.nameStr = obj.Name;
3723 detobj.ownerUUID = obj.OwnerID;
3724 detobj.posVector = obj.AbsolutePosition;
3725 detobj.rotQuat = obj.GetWorldRotation();
3726 detobj.velVector = obj.Velocity;
3727 detobj.colliderType = 0;
3728 detobj.groupUUID = obj.GroupID;
3729 colliding.Add(detobj);
3730 }
3731 }
3732
3733 if (colliding.Count > 0)
3734 {
3735 StartCollidingMessage.Colliders = colliding;
3736
3737 foreach (SceneObjectGroup att in Attachments)
3738 Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
3739 }
3740 }
3741
3742 if (endedColliders.Count > 0)
3743 {
3744 ColliderArgs EndCollidingMessage = new ColliderArgs();
3745 List<DetectedObject> colliding = new List<DetectedObject>();
3746 foreach (uint localId in endedColliders)
3747 {
3748 if (localId == 0)
3749 continue;
3750
3751 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
3752 string data = "";
3753 if (obj != null)
3754 {
3755 DetectedObject detobj = new DetectedObject();
3756 detobj.keyUUID = obj.UUID;
3757 detobj.nameStr = obj.Name;
3758 detobj.ownerUUID = obj.OwnerID;
3759 detobj.posVector = obj.AbsolutePosition;
3760 detobj.rotQuat = obj.GetWorldRotation();
3761 detobj.velVector = obj.Velocity;
3762 detobj.colliderType = 0;
3763 detobj.groupUUID = obj.GroupID;
3764 colliding.Add(detobj);
3765 }
3766 }
3767
3768 if (colliding.Count > 0)
3769 {
3770 EndCollidingMessage.Colliders = colliding;
3771
3772 foreach (SceneObjectGroup att in Attachments)
3773 Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
3774 }
3775 }
3776
3777 if (thisHitColliders.Count > 0)
3778 {
3779 ColliderArgs CollidingMessage = new ColliderArgs();
3780 List<DetectedObject> colliding = new List<DetectedObject>();
3781 foreach (uint localId in thisHitColliders)
3782 {
3783 if (localId == 0)
3784 continue;
3785
3786 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
3787 string data = "";
3788 if (obj != null)
3789 {
3790 DetectedObject detobj = new DetectedObject();
3791 detobj.keyUUID = obj.UUID;
3792 detobj.nameStr = obj.Name;
3793 detobj.ownerUUID = obj.OwnerID;
3794 detobj.posVector = obj.AbsolutePosition;
3795 detobj.rotQuat = obj.GetWorldRotation();
3796 detobj.velVector = obj.Velocity;
3797 detobj.colliderType = 0;
3798 detobj.groupUUID = obj.GroupID;
3799 colliding.Add(detobj);
3800 }
3801 }
3802
3803 if (colliding.Count > 0)
3804 {
3805 CollidingMessage.Colliders = colliding;
3806
3807 lock (m_attachments)
3808 {
3809 foreach (SceneObjectGroup att in m_attachments)
3810 Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
3811 }
3812 }
3813 }
3814
3271 if (m_invulnerable) 3815 if (m_invulnerable)
3272 return; 3816 return;
3273 3817
@@ -3693,6 +4237,39 @@ namespace OpenSim.Region.Framework.Scenes
3693 return; 4237 return;
3694 } 4238 }
3695 4239
4240 XmlDocument doc = new XmlDocument();
4241 string stateData = String.Empty;
4242
4243 IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
4244 if (attServ != null)
4245 {
4246 m_log.DebugFormat("[ATTACHMENT]: Loading attachment data from attachment service");
4247 stateData = attServ.Get(ControllingClient.AgentId.ToString());
4248 if (stateData != String.Empty)
4249 {
4250 try
4251 {
4252 doc.LoadXml(stateData);
4253 }
4254 catch { }
4255 }
4256 }
4257
4258 Dictionary<UUID, string> itemData = new Dictionary<UUID, string>();
4259
4260 XmlNodeList nodes = doc.GetElementsByTagName("Attachment");
4261 if (nodes.Count > 0)
4262 {
4263 foreach (XmlNode n in nodes)
4264 {
4265 XmlElement elem = (XmlElement)n;
4266 string itemID = elem.GetAttribute("ItemID");
4267 string xml = elem.InnerXml;
4268
4269 itemData[new UUID(itemID)] = xml;
4270 }
4271 }
4272
3696 List<AvatarAttachment> attachments = m_appearance.GetAttachments(); 4273 List<AvatarAttachment> attachments = m_appearance.GetAttachments();
3697 foreach (AvatarAttachment attach in attachments) 4274 foreach (AvatarAttachment attach in attachments)
3698 { 4275 {
@@ -3713,7 +4290,30 @@ namespace OpenSim.Region.Framework.Scenes
3713 4290
3714 try 4291 try
3715 { 4292 {
3716 m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p); 4293 string xmlData;
4294 XmlDocument d = new XmlDocument();
4295 UUID asset;
4296 if (itemData.TryGetValue(itemID, out xmlData))
4297 {
4298 d.LoadXml(xmlData);
4299 m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", itemID);
4300
4301 // Rez from inventory
4302 asset
4303 = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p, true, d);
4304
4305 }
4306 else
4307 {
4308 // Rez from inventory (with a null doc to let
4309 // CHANGED_OWNER happen)
4310 asset
4311 = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p, true, null);
4312 }
4313
4314 m_log.InfoFormat(
4315 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2}",
4316 p, itemID, asset);
3717 } 4317 }
3718 catch (Exception e) 4318 catch (Exception e)
3719 { 4319 {
@@ -3746,6 +4346,15 @@ namespace OpenSim.Region.Framework.Scenes
3746 m_reprioritization_called = false; 4346 m_reprioritization_called = false;
3747 } 4347 }
3748 } 4348 }
4349
4350 private Vector3 Quat2Euler(Quaternion rot){
4351 float x = Utils.RAD_TO_DEG * (float)Math.Atan2((double)((2.0f * rot.X * rot.W) - (2.0f * rot.Y * rot.Z)) ,
4352 (double)(1 - (2.0f * rot.X * rot.X) - (2.0f * rot.Z * rot.Z)));
4353 float y = Utils.RAD_TO_DEG * (float)Math.Asin ((double)((2.0f * rot.X * rot.Y) + (2.0f * rot.Z * rot.W)));
4354 float z = Utils.RAD_TO_DEG * (float)Math.Atan2(((double)(2.0f * rot.Y * rot.W) - (2.0f * rot.X * rot.Z)) ,
4355 (double)(1 - (2.0f * rot.Y * rot.Y) - (2.0f * rot.Z * rot.Z)));
4356 return(new Vector3(x,y,z));
4357 }
3749 4358
3750 public void SaveChangedAttachments() 4359 public void SaveChangedAttachments()
3751 { 4360 {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 9cf5a39..1fe31b0 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
102 sceneObject.AddPart(part); 102 sceneObject.AddPart(part);
103 part.LinkNum = linkNum; 103 part.LinkNum = linkNum;
104 part.TrimPermissions(); 104 part.TrimPermissions();
105 part.StoreUndoState(); 105 part.StoreUndoState(UndoType.STATE_ALL);
106 reader.Close(); 106 reader.Close();
107 sr.Close(); 107 sr.Close();
108 } 108 }
@@ -220,7 +220,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
220 if (originalLinkNum != 0) 220 if (originalLinkNum != 0)
221 part.LinkNum = originalLinkNum; 221 part.LinkNum = originalLinkNum;
222 222
223 part.StoreUndoState(); 223 part.StoreUndoState(UndoType.STATE_ALL);
224 reader.Close(); 224 reader.Close();
225 sr.Close(); 225 sr.Close();
226 } 226 }
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 55e407e..f71b507 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,48 +27,125 @@
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using System;
30 31
31namespace OpenSim.Region.Framework.Scenes 32namespace OpenSim.Region.Framework.Scenes
32{ 33{
34 [Flags]
35 public enum UndoType
36 {
37 STATE_PRIM_POSITION = 1,
38 STATE_PRIM_ROTATION = 2,
39 STATE_PRIM_SCALE = 4,
40 STATE_PRIM_ALL = 7,
41 STATE_GROUP_POSITION = 8,
42 STATE_GROUP_ROTATION = 16,
43 STATE_GROUP_SCALE = 32,
44 STATE_GROUP_ALL = 56,
45 STATE_ALL = 63
46 }
47
33 public class UndoState 48 public class UndoState
34 { 49 {
35 public Vector3 Position = Vector3.Zero; 50 public Vector3 Position = Vector3.Zero;
36 public Vector3 Scale = Vector3.Zero; 51 public Vector3 Scale = Vector3.Zero;
37 public Quaternion Rotation = Quaternion.Identity; 52 public Quaternion Rotation = Quaternion.Identity;
53 public Vector3 GroupPosition = Vector3.Zero;
54 public Quaternion GroupRotation = Quaternion.Identity;
55 public Vector3 GroupScale = Vector3.Zero;
56 public DateTime LastUpdated = DateTime.Now;
57 public UndoType Type;
38 58
39 public UndoState(SceneObjectPart part) 59 public UndoState(SceneObjectPart part, UndoType type)
40 { 60 {
61 Type = type;
41 if (part != null) 62 if (part != null)
42 { 63 {
43 if (part.ParentID == 0) 64 if (part.ParentID == 0)
44 { 65 {
45 Position = part.ParentGroup.AbsolutePosition; 66 GroupScale = part.ParentGroup.RootPart.Shape.Scale;
67
68 //FUBAR WARNING: Do NOT get the group's absoluteposition here
69 //or you'll experience a loop and/or a stack issue
70 GroupPosition = part.ParentGroup.RootPart.AbsolutePosition;
71 GroupRotation = part.ParentGroup.GroupRotation;
72 Position = part.ParentGroup.RootPart.AbsolutePosition;
46 Rotation = part.RotationOffset; 73 Rotation = part.RotationOffset;
47 Scale = part.Shape.Scale; 74 Scale = part.Shape.Scale;
75 LastUpdated = DateTime.Now;
48 } 76 }
49 else 77 else
50 { 78 {
79 GroupScale = part.Shape.Scale;
80
81 //FUBAR WARNING: Do NOT get the group's absoluteposition here
82 //or you'll experience a loop and/or a stack issue
83 GroupPosition = part.ParentGroup.RootPart.AbsolutePosition;
84 GroupRotation = part.ParentGroup.Rotation;
51 Position = part.OffsetPosition; 85 Position = part.OffsetPosition;
52 Rotation = part.RotationOffset; 86 Rotation = part.RotationOffset;
53 Scale = part.Shape.Scale; 87 Scale = part.Shape.Scale;
88 LastUpdated = DateTime.Now;
54 } 89 }
55 } 90 }
56 } 91 }
57 92 public void Merge(UndoState last)
93 {
94 if ((Type & UndoType.STATE_GROUP_POSITION) == 0 || ((last.Type & UndoType.STATE_GROUP_POSITION) >= (Type & UndoType.STATE_GROUP_POSITION)))
95 {
96 GroupPosition = last.GroupPosition;
97 Position = last.Position;
98 }
99 if ((Type & UndoType.STATE_GROUP_SCALE) == 0 || ((last.Type & UndoType.STATE_GROUP_SCALE) >= (Type & UndoType.STATE_GROUP_SCALE)))
100 {
101 GroupScale = last.GroupScale;
102 Scale = last.Scale;
103 }
104 if ((Type & UndoType.STATE_GROUP_ROTATION) == 0 || ((last.Type & UndoType.STATE_GROUP_ROTATION) >= (Type & UndoType.STATE_GROUP_ROTATION)))
105 {
106 GroupRotation = last.GroupRotation;
107 Rotation = last.Rotation;
108 }
109 if ((Type & UndoType.STATE_PRIM_POSITION) == 0 || ((last.Type & UndoType.STATE_PRIM_POSITION) >= (Type & UndoType.STATE_PRIM_POSITION)))
110 {
111 Position = last.Position;
112 }
113 if ((Type & UndoType.STATE_PRIM_SCALE) == 0 || ((last.Type & UndoType.STATE_PRIM_SCALE) >= (Type & UndoType.STATE_PRIM_SCALE)))
114 {
115 Scale = last.Scale;
116 }
117 if ((Type & UndoType.STATE_PRIM_ROTATION) == 0 || ((last.Type & UndoType.STATE_PRIM_ROTATION) >= (Type & UndoType.STATE_PRIM_ROTATION)))
118 {
119 Rotation = last.Rotation;
120 }
121 Type = Type | last.Type;
122 }
123 public bool Compare(UndoState undo)
124 {
125 if (undo == null || Position == null) return false;
126 if (undo.Position == Position && undo.Rotation == Rotation && undo.Scale == Scale && undo.GroupPosition == GroupPosition && undo.GroupScale == GroupScale && undo.GroupRotation == GroupRotation)
127 {
128 return true;
129 }
130 else
131 {
132 return false;
133 }
134 }
58 public bool Compare(SceneObjectPart part) 135 public bool Compare(SceneObjectPart part)
59 { 136 {
60 if (part != null) 137 if (part != null)
61 { 138 {
62 if (part.ParentID == 0) 139 if (part.ParentID == 0)
63 { 140 {
64 if (Position == part.ParentGroup.AbsolutePosition && Rotation == part.ParentGroup.Rotation) 141 if (Position == part.ParentGroup.RootPart.AbsolutePosition && Rotation == part.ParentGroup.Rotation && GroupPosition == part.ParentGroup.RootPart.AbsolutePosition && part.ParentGroup.Rotation == GroupRotation && part.Shape.Scale == GroupScale)
65 return true; 142 return true;
66 else 143 else
67 return false; 144 return false;
68 } 145 }
69 else 146 else
70 { 147 {
71 if (Position == part.OffsetPosition && Rotation == part.RotationOffset && Scale == part.Shape.Scale) 148 if (Position == part.OffsetPosition && Rotation == part.RotationOffset && Scale == part.Shape.Scale && GroupPosition == part.ParentGroup.RootPart.AbsolutePosition && part.ParentGroup.Rotation == GroupRotation && part.Shape.Scale == GroupScale)
72 return true; 149 return true;
73 else 150 else
74 return false; 151 return false;
@@ -78,62 +155,70 @@ namespace OpenSim.Region.Framework.Scenes
78 return false; 155 return false;
79 } 156 }
80 157
81 public void PlaybackState(SceneObjectPart part) 158 private void RestoreState(SceneObjectPart part)
82 { 159 {
160 bool GroupChange = false;
161 if ((Type & UndoType.STATE_GROUP_POSITION) != 0
162 || (Type & UndoType.STATE_GROUP_ROTATION) != 0
163 || (Type & UndoType.STATE_GROUP_SCALE) != 0)
164 {
165 GroupChange = true;
166 }
167
83 if (part != null) 168 if (part != null)
84 { 169 {
85 part.Undoing = true; 170 part.Undoing = true;
86 171
87 if (part.ParentID == 0) 172 if (part.ParentID == 0 && GroupChange == false)
88 { 173 {
89 if (Position != Vector3.Zero) 174 if (Position != Vector3.Zero)
90 part.ParentGroup.AbsolutePosition = Position; 175
91 part.RotationOffset = Rotation; 176 part.ParentGroup.UpdateSinglePosition(Position, part.LocalId);
177 part.ParentGroup.UpdateSingleRotation(Rotation, part.LocalId);
92 if (Scale != Vector3.Zero) 178 if (Scale != Vector3.Zero)
93 part.Resize(Scale); 179 part.Resize(Scale);
94 part.ParentGroup.ScheduleGroupForTerseUpdate(); 180 part.ParentGroup.ScheduleGroupForTerseUpdate();
95 } 181 }
96 else 182 else
97 { 183 {
98 if (Position != Vector3.Zero) 184 if (GroupChange)
99 part.OffsetPosition = Position; 185 {
100 part.UpdateRotation(Rotation); 186 part.ParentGroup.RootPart.Undoing = true;
101 if (Scale != Vector3.Zero) 187 if (GroupPosition != Vector3.Zero)
102 part.Resize(Scale); part.ScheduleTerseUpdate(); 188 {
189 //Calculate the scale...
190 Vector3 gs = part.Shape.Scale;
191 float scale = GroupScale.Z / gs.Z;
192
193 //Scale first since it can affect our position
194 part.ParentGroup.GroupResize(gs * scale, part.LocalId);
195 part.ParentGroup.AbsolutePosition = GroupPosition;
196 part.ParentGroup.UpdateGroupRotationR(GroupRotation);
197
198 }
199 part.ParentGroup.RootPart.Undoing = false;
200 }
201 else
202 {
203 if (Position != Vector3.Zero) //We can use this for all the updates since all are set
204 {
205 part.OffsetPosition = Position;
206 part.UpdateRotation(Rotation);
207 part.Resize(Scale); part.ScheduleTerseUpdate();
208 }
209 }
103 } 210 }
104 part.Undoing = false; 211 part.Undoing = false;
105 212
106 } 213 }
107 } 214 }
215 public void PlaybackState(SceneObjectPart part)
216 {
217 RestoreState(part);
218 }
108 public void PlayfwdState(SceneObjectPart part) 219 public void PlayfwdState(SceneObjectPart part)
109 { 220 {
110 if (part != null) 221 RestoreState(part);
111 {
112 part.Undoing = true;
113
114 if (part.ParentID == 0)
115 {
116 if (Position != Vector3.Zero)
117 part.ParentGroup.AbsolutePosition = Position;
118 if (Rotation != Quaternion.Identity)
119 part.UpdateRotation(Rotation);
120 if (Scale != Vector3.Zero)
121 part.Resize(Scale);
122 part.ParentGroup.ScheduleGroupForTerseUpdate();
123 }
124 else
125 {
126 if (Position != Vector3.Zero)
127 part.OffsetPosition = Position;
128 if (Rotation != Quaternion.Identity)
129 part.UpdateRotation(Rotation);
130 if (Scale != Vector3.Zero)
131 part.Resize(Scale);
132 part.ScheduleTerseUpdate();
133 }
134 part.Undoing = false;
135
136 }
137 } 222 }
138 } 223 }
139 public class LandUndoState 224 public class LandUndoState
@@ -161,3 +246,4 @@ namespace OpenSim.Region.Framework.Scenes
161 } 246 }
162 } 247 }
163} 248}
249
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index fc17192..276e46d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -813,6 +813,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
813 public event ObjectOwner OnObjectOwner; 813 public event ObjectOwner OnObjectOwner;
814 public event DirPlacesQuery OnDirPlacesQuery; 814 public event DirPlacesQuery OnDirPlacesQuery;
815 public event DirFindQuery OnDirFindQuery; 815 public event DirFindQuery OnDirFindQuery;
816 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
816 public event DirLandQuery OnDirLandQuery; 817 public event DirLandQuery OnDirLandQuery;
817 public event DirPopularQuery OnDirPopularQuery; 818 public event DirPopularQuery OnDirPopularQuery;
818 public event DirClassifiedQuery OnDirClassifiedQuery; 819 public event DirClassifiedQuery OnDirClassifiedQuery;
@@ -883,6 +884,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
883 884
884 public void Close() 885 public void Close()
885 { 886 {
887 Close(true);
888 }
889
890 public void Close(bool sendStop)
891 {
886 Disconnect(); 892 Disconnect();
887 } 893 }
888 894
@@ -937,7 +943,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
937 943
938 } 944 }
939 945
940 public void SendKillObject(ulong regionHandle, uint localID) 946 public void SendKillObject(ulong regionHandle, List<uint> localID)
941 { 947 {
942 948
943 } 949 }
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 3a6996e..84c7f29 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -259,9 +259,10 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
259 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles. 259 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles.
260 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup(); 260 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup();
261 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); 261 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
262 scene.SendKillObject(scene.Entities[uuid].LocalId); 262 scene.SendKillObject(new List<uint>() { scene.Entities[uuid].LocalId });
263 scene.SceneGraph.DeleteSceneObject(uuid, false); 263 scene.SceneGraph.DeleteSceneObject(uuid, false);
264 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroupFromScene(false); 264 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroupFromScene(false);
265 scene.SendKillObject(new List<uint>() { ((SceneObjectGroup)scene.Entities[uuid]).LocalId });
265 } 266 }
266 catch(Exception e) 267 catch(Exception e)
267 { 268 {
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index c7b1ed7..cd60f4b 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
175 //This is important because we are not IN any database. 175 //This is important because we are not IN any database.
176 //m_Entity.FakeDeleteGroup(); 176 //m_Entity.FakeDeleteGroup();
177 foreach (SceneObjectPart part in m_Entity.Parts) 177 foreach (SceneObjectPart part in m_Entity.Parts)
178 client.SendKillObject(m_Entity.RegionHandle, part.LocalId); 178 client.SendKillObject(m_Entity.RegionHandle, new List<uint>() { part.LocalId });
179 } 179 }
180 180
181 /// <summary> 181 /// <summary>
@@ -187,7 +187,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
187 { 187 {
188 m_Entity.Scene.ForEachClient( 188 m_Entity.Scene.ForEachClient(
189 delegate(IClientAPI controller) 189 delegate(IClientAPI controller)
190 { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); } 190 { controller.SendKillObject(m_Entity.RegionHandle, new List<uint>() { part.LocalId }); }
191 ); 191 );
192 } 192 }
193 } 193 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index 32659c8..11c87f8 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -42,17 +42,22 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
42 public class XmlRpcRouter : IRegionModule, IXmlRpcRouter 42 public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
43 { 43 {
44 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45 private bool m_enabled = false;
46 public void Initialise(Scene scene, IConfigSource config) 46 public void Initialise(Scene scene, IConfigSource config)
47 { 47 {
48 IConfig startupConfig = config.Configs["Startup"]; 48 IConfig startupConfig = config.Configs["XMLRPC"];
49 if (startupConfig == null) 49 if (startupConfig == null)
50 return; 50 return;
51 51
52 if (startupConfig.GetString("XmlRpcRouterModule", 52 if (startupConfig.GetString("XmlRpcRouterModule",
53 "XmlRpcRouterModule") == "XmlRpcRouterModule") 53 "") == "XmlRpcRouterModule")
54 { 54 {
55 scene.RegisterModuleInterface<IXmlRpcRouter>(this); 55 scene.RegisterModuleInterface<IXmlRpcRouter>(this);
56 m_enabled = true;
57 }
58 else
59 {
60 m_enabled = false;
56 } 61 }
57 } 62 }
58 63
@@ -76,7 +81,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
76 81
77 public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) 82 public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
78 { 83 {
79 scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri}); 84 if (m_enabled)
85 {
86 scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] { uri });
87 }
80 } 88 }
81 89
82 public void ScriptRemoved(UUID itemID) 90 public void ScriptRemoved(UUID itemID)
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6928c4e..39c3364 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
156#pragma warning disable 67 156#pragma warning disable 67
157 public event Action<IClientAPI> OnLogout; 157 public event Action<IClientAPI> OnLogout;
158 public event ObjectPermissions OnObjectPermissions; 158 public event ObjectPermissions OnObjectPermissions;
159 159 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
160 public event MoneyTransferRequest OnMoneyTransferRequest; 160 public event MoneyTransferRequest OnMoneyTransferRequest;
161 public event ParcelBuy OnParcelBuy; 161 public event ParcelBuy OnParcelBuy;
162 public event Action<IClientAPI> OnConnectionClosed; 162 public event Action<IClientAPI> OnConnectionClosed;
@@ -519,7 +519,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
519 519
520 } 520 }
521 521
522 public virtual void SendKillObject(ulong regionHandle, uint localID) 522 public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
523 { 523 {
524 } 524 }
525 525
@@ -842,6 +842,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
842 842
843 public void Close() 843 public void Close()
844 { 844 {
845 Close(true);
846 }
847
848 public void Close(bool sendStop)
849 {
845 } 850 }
846 851
847 public void Start() 852 public void Start()
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 421da36..2563361 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
386 m_scene.ForEachClient(delegate(IClientAPI controller) 386 m_scene.ForEachClient(delegate(IClientAPI controller)
387 { 387 {
388 controller.SendKillObject(m_scene.RegionInfo.RegionHandle, 388 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
389 selectedTree.LocalId); 389 new List<uint>() { selectedTree.LocalId });
390 }); 390 });
391 } 391 }
392 else 392 else
@@ -727,7 +727,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
727 m_scene.ForEachClient(delegate(IClientAPI controller) 727 m_scene.ForEachClient(delegate(IClientAPI controller)
728 { 728 {
729 controller.SendKillObject(m_scene.RegionInfo.RegionHandle, 729 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
730 selectedTree.LocalId); 730 new List<uint>() { selectedTree.LocalId });
731 }); 731 });
732 732
733 break; 733 break;
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index ac4e2b9..f13c323 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -624,8 +624,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
624 { 624 {
625 set { return; } 625 set { return; }
626 } 626 }
627 627
628
629 public override Quaternion APIDTarget 628 public override Quaternion APIDTarget
630 { 629 {
631 set { return; } 630 set { return; }
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index e2a6a2e..f4245b6 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -996,7 +996,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
996 { 996 {
997 997
998 } 998 }
999 999
1000 public override void VehicleFlags(int param, bool remove) 1000 public override void VehicleFlags(int param, bool remove)
1001 { 1001 {
1002 1002
diff --git a/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..d65929a
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using System.Runtime.InteropServices;
30
31// Information about this assembly is defined by the following
32// attributes.
33//
34// change them to the information which is associated with the assembly
35// you compile.
36
37[assembly : AssemblyTitle("OdePlugin")]
38[assembly : AssemblyDescription("")]
39[assembly : AssemblyConfiguration("")]
40[assembly : AssemblyCompany("http://opensimulator.org")]
41[assembly : AssemblyProduct("OdePlugin")]
42[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
43[assembly : AssemblyTrademark("")]
44[assembly : AssemblyCulture("")]
45
46// This sets the default COM visibility of types in the assembly to invisible.
47// If you need to expose a type to COM, use [ComVisible(true)] on that type.
48
49[assembly : ComVisible(false)]
50
51// The assembly version has following format :
52//
53// Major.Minor.Build.Revision
54//
55// You can specify all values by your own or you can build default build and revision
56// numbers with the '*' character (the default):
57
58[assembly : AssemblyVersion("0.6.5.*")]
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
new file mode 100644
index 0000000..505d455
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -0,0 +1,1437 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using OpenMetaverse;
32using Ode.NET;
33using OpenSim.Framework;
34using OpenSim.Region.Physics.Manager;
35using log4net;
36
37namespace OpenSim.Region.Physics.OdePlugin
38{
39 /// <summary>
40 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
41 /// </summary>
42
43 public enum dParam : int
44 {
45 LowStop = 0,
46 HiStop = 1,
47 Vel = 2,
48 FMax = 3,
49 FudgeFactor = 4,
50 Bounce = 5,
51 CFM = 6,
52 StopERP = 7,
53 StopCFM = 8,
54 LoStop2 = 256,
55 HiStop2 = 257,
56 Vel2 = 258,
57 FMax2 = 259,
58 StopERP2 = 7 + 256,
59 StopCFM2 = 8 + 256,
60 LoStop3 = 512,
61 HiStop3 = 513,
62 Vel3 = 514,
63 FMax3 = 515,
64 StopERP3 = 7 + 512,
65 StopCFM3 = 8 + 512
66 }
67 public class OdeCharacter : PhysicsActor
68 {
69 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
70
71 private Vector3 _position;
72 private d.Vector3 _zeroPosition;
73 // private d.Matrix3 m_StandUpRotation;
74 private bool _zeroFlag = false;
75 private bool m_lastUpdateSent = false;
76 private Vector3 _velocity;
77 private Vector3 _target_velocity;
78 private Vector3 _acceleration;
79 private Vector3 m_rotationalVelocity;
80 private float m_mass = 80f;
81 public float m_density = 60f;
82 private bool m_pidControllerActive = true;
83 public float PID_D = 800.0f;
84 public float PID_P = 900.0f;
85 //private static float POSTURE_SERVO = 10000.0f;
86 public float CAPSULE_RADIUS = 0.37f;
87 public float CAPSULE_LENGTH = 2.140599f;
88 public float m_tensor = 3800000f;
89 public float heightFudgeFactor = 0.52f;
90 public float walkDivisor = 1.3f;
91 public float runDivisor = 0.8f;
92 private bool flying = false;
93 private bool jumping = false; // add for jumping
94 private bool m_iscolliding = false;
95 private bool m_iscollidingGround = false;
96 private bool m_wascolliding = false;
97 private bool m_wascollidingGround = false;
98 private bool m_iscollidingObj = false;
99 private bool m_alwaysRun = false;
100 private bool m_hackSentFall = false;
101 private bool m_hackSentFly = false;
102 private int m_requestedUpdateFrequency = 0;
103 private Vector3 m_taintPosition = Vector3.Zero;
104 public uint m_localID = 0;
105 public bool m_returnCollisions = false;
106 // taints and their non-tainted counterparts
107 public bool m_isPhysical = false; // the current physical status
108 public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing)
109 public float MinimumGroundFlightOffset = 3f;
110
111 private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes.
112 private float m_tiltMagnitudeWhenProjectedOnXYPlane = 0.1131371f; // used to introduce a fixed tilt because a straight-up capsule falls through terrain, probably a bug in terrain collider
113
114
115 private float m_buoyancy = 0f;
116
117 // private CollisionLocker ode;
118
119 private string m_name = String.Empty;
120
121 private bool[] m_colliderarr = new bool[11];
122 private bool[] m_colliderGroundarr = new bool[11];
123
124 // Default we're a Character
125 private CollisionCategories m_collisionCategories = (CollisionCategories.Character);
126
127 // Default, Collide with Other Geometries, spaces, bodies and characters.
128 private CollisionCategories m_collisionFlags = (CollisionCategories.Geom
129 | CollisionCategories.Space
130 | CollisionCategories.Body
131 | CollisionCategories.Character
132 | CollisionCategories.Land);
133 public IntPtr Body = IntPtr.Zero;
134 private OdeScene _parent_scene;
135 public IntPtr Shell = IntPtr.Zero;
136 public IntPtr Amotor = IntPtr.Zero;
137 public d.Mass ShellMass;
138 public bool collidelock = false;
139
140 public int m_eventsubscription = 0;
141 private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
142
143 // unique UUID of this character object
144 public UUID m_uuid;
145 public bool bad = false;
146 private Object m_syncRoot = new Object();
147
148 public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, CollisionLocker dode, Vector3 size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
149 {
150 m_uuid = UUID.Random();
151
152 if (pos.IsFinite())
153 {
154 if (pos.Z > 9999999f)
155 {
156 pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
157 }
158 if (pos.Z < -90000f)
159 {
160 pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
161 }
162 _position = pos;
163 m_taintPosition.X = pos.X;
164 m_taintPosition.Y = pos.Y;
165 m_taintPosition.Z = pos.Z;
166 }
167 else
168 {
169 _position = new Vector3(((float)_parent_scene.WorldExtents.X * 0.5f), ((float)_parent_scene.WorldExtents.Y * 0.5f), parent_scene.GetTerrainHeightAtXY(128f, 128f) + 10f);
170 m_taintPosition.X = _position.X;
171 m_taintPosition.Y = _position.Y;
172 m_taintPosition.Z = _position.Z;
173 m_log.Warn("[PHYSICS]: Got NaN Position on Character Create");
174 }
175
176 _parent_scene = parent_scene;
177
178 PID_D = pid_d;
179 PID_P = pid_p;
180 CAPSULE_RADIUS = capsule_radius;
181 m_tensor = tensor;
182 m_density = density;
183 heightFudgeFactor = height_fudge_factor;
184 walkDivisor = walk_divisor;
185 runDivisor = rundivisor;
186
187 // m_StandUpRotation =
188 // new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f,
189 // 0.5f);
190
191 for (int i = 0; i < 11; i++)
192 {
193 m_colliderarr[i] = false;
194 }
195 CAPSULE_LENGTH = (size.Z * 1.15f) - CAPSULE_RADIUS * 2.0f;
196 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
197 m_tainted_CAPSULE_LENGTH = CAPSULE_LENGTH;
198
199 m_isPhysical = false; // current status: no ODE information exists
200 m_tainted_isPhysical = true; // new tainted status: need to create ODE information
201
202 _parent_scene.AddPhysicsActorTaint(this);
203
204 m_name = avName;
205 }
206
207 public override int PhysicsActorType
208 {
209 get { return (int) ActorTypes.Agent; }
210 set { return; }
211 }
212
213 /// <summary>
214 /// If this is set, the avatar will move faster
215 /// </summary>
216 public override bool SetAlwaysRun
217 {
218 get { return m_alwaysRun; }
219 set { m_alwaysRun = value; }
220 }
221
222 public override uint LocalID
223 {
224 set { m_localID = value; }
225 }
226
227 public override bool Grabbed
228 {
229 set { return; }
230 }
231
232 public override bool Selected
233 {
234// set { return; }
235 set { jumping = value; } // add for jumping flag
236 }
237
238 public override float Buoyancy
239 {
240 get { return m_buoyancy; }
241 set { m_buoyancy = value; }
242 }
243
244 public override bool FloatOnWater
245 {
246 set { return; }
247 }
248
249 public override bool IsPhysical
250 {
251 get { return false; }
252 set { return; }
253 }
254
255 public override bool ThrottleUpdates
256 {
257 get { return false; }
258 set { return; }
259 }
260
261 public override bool Flying
262 {
263 get { return flying; }
264 set { flying = value; }
265 }
266
267 /// <summary>
268 /// Returns if the avatar is colliding in general.
269 /// This includes the ground and objects and avatar.
270 /// </summary>
271 public override bool IsColliding
272 {
273//#@ get { return m_iscolliding; }
274 get { //##
275//Console.WriteLine(">>>>>>>>>>>> IC get = {0}", m_iscolliding); //##
276 return m_iscolliding; } //##
277 set
278 {
279 int i;
280 int truecount = 0;
281 int falsecount = 0;
282
283 if (m_colliderarr.Length >= 10)
284 {
285 for (i = 0; i < 10; i++)
286 {
287 m_colliderarr[i] = m_colliderarr[i + 1];
288 }
289 }
290 m_colliderarr[10] = value;
291
292 for (i = 0; i < 11; i++)
293 {
294 if (m_colliderarr[i])
295 {
296 truecount++;
297 }
298 else
299 {
300 falsecount++;
301 }
302 }
303
304 // Equal truecounts and false counts means we're colliding with something.
305
306 if (falsecount > 1.2*truecount)
307 {
308 m_iscolliding = false;
309 }
310 else
311 {
312 m_iscolliding = true;
313 }
314// ## Console.WriteLine("IC SET = {0} t{1} f{2} i {3}", value, truecount, falsecount, m_iscolliding);
315 if (m_wascolliding != m_iscolliding)
316 {
317 //base.SendCollisionUpdate(new CollisionEventUpdate());
318 }
319 m_wascolliding = m_iscolliding;
320 }
321 }
322
323 /// <summary>
324 /// Returns if an avatar is colliding with the ground
325 /// </summary>
326 public override bool CollidingGround
327 {
328 get { return m_iscollidingGround; }
329 set
330 {
331 // Collisions against the ground are not really reliable
332 // So, to get a consistant value we have to average the current result over time
333 // Currently we use 1 second = 10 calls to this.
334 int i;
335 int truecount = 0;
336 int falsecount = 0;
337
338 if (m_colliderGroundarr.Length >= 10)
339 {
340 for (i = 0; i < 10; i++)
341 {
342 m_colliderGroundarr[i] = m_colliderGroundarr[i + 1];
343 }
344 }
345 m_colliderGroundarr[10] = value;
346
347 for (i = 0; i < 11; i++)
348 {
349 if (m_colliderGroundarr[i])
350 {
351 truecount++;
352 }
353 else
354 {
355 falsecount++;
356 }
357 }
358
359 // Equal truecounts and false counts means we're colliding with something.
360
361 if (falsecount > 1.2*truecount)
362 {
363 m_iscollidingGround = false;
364 }
365 else
366 {
367 m_iscollidingGround = true;
368 }
369 if (m_wascollidingGround != m_iscollidingGround)
370 {
371 //base.SendCollisionUpdate(new CollisionEventUpdate());
372 }
373 m_wascollidingGround = m_iscollidingGround;
374 }
375 }
376
377 /// <summary>
378 /// Returns if the avatar is colliding with an object
379 /// </summary>
380 public override bool CollidingObj
381 {
382 get { return m_iscollidingObj; }
383 set
384 {
385 m_iscollidingObj = value;
386 if (value)
387 m_pidControllerActive = false;
388 else
389 m_pidControllerActive = true;
390 }
391 }
392
393 /// <summary>
394 /// turn the PID controller on or off.
395 /// The PID Controller will turn on all by itself in many situations
396 /// </summary>
397 /// <param name="status"></param>
398 public void SetPidStatus(bool status)
399 {
400 m_pidControllerActive = status;
401 }
402
403 public override bool Stopped
404 {
405 get { return _zeroFlag; }
406 }
407
408 /// <summary>
409 /// This 'puts' an avatar somewhere in the physics space.
410 /// Not really a good choice unless you 'know' it's a good
411 /// spot otherwise you're likely to orbit the avatar.
412 /// </summary>
413 public override Vector3 Position
414 {
415 get { return _position; }
416 set
417 {
418 if (Body == IntPtr.Zero || Shell == IntPtr.Zero)
419 {
420 if (value.IsFinite())
421 {
422 if (value.Z > 9999999f)
423 {
424 value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
425 }
426 if (value.Z < -90000f)
427 {
428 value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
429 }
430
431 _position.X = value.X;
432 _position.Y = value.Y;
433 _position.Z = value.Z;
434
435 m_taintPosition.X = value.X;
436 m_taintPosition.Y = value.Y;
437 m_taintPosition.Z = value.Z;
438 _parent_scene.AddPhysicsActorTaint(this);
439 }
440 else
441 {
442 m_log.Warn("[PHYSICS]: Got a NaN Position from Scene on a Character");
443 }
444 }
445 }
446 }
447
448 public override Vector3 RotationalVelocity
449 {
450 get { return m_rotationalVelocity; }
451 set { m_rotationalVelocity = value; }
452 }
453
454 /// <summary>
455 /// This property sets the height of the avatar only. We use the height to make sure the avatar stands up straight
456 /// and use it to offset landings properly
457 /// </summary>
458 public override Vector3 Size
459 {
460 get { return new Vector3(CAPSULE_RADIUS * 2, CAPSULE_RADIUS * 2, CAPSULE_LENGTH); }
461 set
462 {
463 if (value.IsFinite())
464 {
465 m_pidControllerActive = true;
466
467 Vector3 SetSize = value;
468 m_tainted_CAPSULE_LENGTH = (SetSize.Z*1.15f) - CAPSULE_RADIUS*2.0f;
469 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
470
471 Velocity = Vector3.Zero;
472
473 _parent_scene.AddPhysicsActorTaint(this);
474 }
475 else
476 {
477 m_log.Warn("[PHYSICS]: Got a NaN Size from Scene on a Character");
478 }
479 }
480 }
481
482 private void AlignAvatarTiltWithCurrentDirectionOfMovement(Vector3 movementVector)
483 {
484 movementVector.Z = 0f;
485 float magnitude = (float)Math.Sqrt((double)(movementVector.X * movementVector.X + movementVector.Y * movementVector.Y));
486 if (magnitude < 0.1f) return;
487
488 // normalize the velocity vector
489 float invMagnitude = 1.0f / magnitude;
490 movementVector.X *= invMagnitude;
491 movementVector.Y *= invMagnitude;
492
493 // if we change the capsule heading too often, the capsule can fall down
494 // therefore we snap movement vector to just 1 of 4 predefined directions (ne, nw, se, sw),
495 // meaning only 4 possible capsule tilt orientations
496 if (movementVector.X > 0)
497 {
498 // east
499 if (movementVector.Y > 0)
500 {
501 // northeast
502 movementVector.X = (float)Math.Sqrt(2.0);
503 movementVector.Y = (float)Math.Sqrt(2.0);
504 }
505 else
506 {
507 // southeast
508 movementVector.X = (float)Math.Sqrt(2.0);
509 movementVector.Y = -(float)Math.Sqrt(2.0);
510 }
511 }
512 else
513 {
514 // west
515 if (movementVector.Y > 0)
516 {
517 // northwest
518 movementVector.X = -(float)Math.Sqrt(2.0);
519 movementVector.Y = (float)Math.Sqrt(2.0);
520 }
521 else
522 {
523 // southwest
524 movementVector.X = -(float)Math.Sqrt(2.0);
525 movementVector.Y = -(float)Math.Sqrt(2.0);
526 }
527 }
528
529
530 // movementVector.Z is zero
531
532 // calculate tilt components based on desired amount of tilt and current (snapped) heading.
533 // the "-" sign is to force the tilt to be OPPOSITE the direction of movement.
534 float xTiltComponent = -movementVector.X * m_tiltMagnitudeWhenProjectedOnXYPlane;
535 float yTiltComponent = -movementVector.Y * m_tiltMagnitudeWhenProjectedOnXYPlane;
536
537 //m_log.Debug("[PHYSICS] changing avatar tilt");
538 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, xTiltComponent);
539 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, xTiltComponent); // must be same as lowstop, else a different, spurious tilt is introduced
540 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, yTiltComponent);
541 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, yTiltComponent); // same as lowstop
542 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, 0f);
543 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
544 }
545
546 /// <summary>
547 /// This creates the Avatar's physical Surrogate at the position supplied
548 /// </summary>
549 /// <param name="npositionX"></param>
550 /// <param name="npositionY"></param>
551 /// <param name="npositionZ"></param>
552
553 // WARNING: This MUST NOT be called outside of ProcessTaints, else we can have unsynchronized access
554 // to ODE internals. ProcessTaints is called from within thread-locked Simulate(), so it is the only
555 // place that is safe to call this routine AvatarGeomAndBodyCreation.
556 private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor)
557 {
558 //CAPSULE_LENGTH = -5;
559 //CAPSULE_RADIUS = -5;
560 int dAMotorEuler = 1;
561 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
562 if (CAPSULE_LENGTH <= 0)
563 {
564 m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!");
565 CAPSULE_LENGTH = 0.01f;
566
567 }
568
569 if (CAPSULE_RADIUS <= 0)
570 {
571 m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!");
572 CAPSULE_RADIUS = 0.01f;
573
574 }
575
576 if(Shell != IntPtr.Zero)
577 {
578 try
579 {
580 d.GeomDestroy(Shell);
581 }
582 catch (System.AccessViolationException)
583 {
584 m_log.Error("[PHYSICS]: PrimGeom dead");
585 }
586 // Remove any old entries
587//string tShell;
588//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
589//Console.WriteLine("**** Remove {0}", tShell);
590 if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
591 if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
592 }
593
594 Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH);
595 _parent_scene.geom_name_map[Shell] = m_name;
596 _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
597Console.WriteLine("**** Create {2} Dicts: actor={0} name={1} height={3} rad={4}", _parent_scene.actor_name_map.Count, _parent_scene.geom_name_map.Count, m_name, CAPSULE_LENGTH, CAPSULE_RADIUS);
598
599 d.GeomSetCategoryBits(Shell, (int)m_collisionCategories);
600 d.GeomSetCollideBits(Shell, (int)m_collisionFlags);
601
602 d.MassSetCapsuleTotal(out ShellMass, m_mass, 2, CAPSULE_RADIUS, CAPSULE_LENGTH);
603 Body = d.BodyCreate(_parent_scene.world);
604 d.BodySetPosition(Body, npositionX, npositionY, npositionZ);
605
606 _position.X = npositionX;
607 _position.Y = npositionY;
608 _position.Z = npositionZ;
609
610
611 m_taintPosition.X = npositionX;
612 m_taintPosition.Y = npositionY;
613 m_taintPosition.Z = npositionZ;
614
615 d.BodySetMass(Body, ref ShellMass);
616 d.Matrix3 m_caprot;
617 // 90 Stand up on the cap of the capped cyllinder
618 if (_parent_scene.IsAvCapsuleTilted)
619 {
620 d.RFromAxisAndAngle(out m_caprot, 1, 0, 1, (float)(Math.PI / 2));
621 }
622 else
623 {
624 d.RFromAxisAndAngle(out m_caprot, 0, 0, 1, (float)(Math.PI / 2));
625 }
626
627
628 d.GeomSetRotation(Shell, ref m_caprot);
629 d.BodySetRotation(Body, ref m_caprot);
630
631 d.GeomSetBody(Shell, Body);
632
633
634 // The purpose of the AMotor here is to keep the avatar's physical
635 // surrogate from rotating while moving
636 Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
637 d.JointAttach(Amotor, Body, IntPtr.Zero);
638 d.JointSetAMotorMode(Amotor, dAMotorEuler);
639 d.JointSetAMotorNumAxes(Amotor, 3);
640 d.JointSetAMotorAxis(Amotor, 0, 0, 1, 0, 0);
641 d.JointSetAMotorAxis(Amotor, 1, 0, 0, 1, 0);
642 d.JointSetAMotorAxis(Amotor, 2, 0, 0, 0, 1);
643 d.JointSetAMotorAngle(Amotor, 0, 0);
644 d.JointSetAMotorAngle(Amotor, 1, 0);
645 d.JointSetAMotorAngle(Amotor, 2, 0);
646
647 // These lowstops and high stops are effectively (no wiggle room)
648 if (_parent_scene.IsAvCapsuleTilted)
649 {
650 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, -0.000000000001f);
651 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0.000000000001f);
652 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, -0.000000000001f);
653 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0.000000000001f);
654 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f);
655 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f);
656 }
657 else
658 {
659 #region Documentation of capsule motor LowStop and HighStop parameters
660 // Intentionally introduce some tilt into the capsule by setting
661 // the motor stops to small epsilon values. This small tilt prevents
662 // the capsule from falling into the terrain; a straight-up capsule
663 // (with -0..0 motor stops) falls into the terrain for reasons yet
664 // to be comprehended in their entirety.
665 #endregion
666 AlignAvatarTiltWithCurrentDirectionOfMovement(Vector3.Zero);
667 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, 0.08f);
668 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0f);
669 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, 0.08f);
670 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0.08f); // must be same as lowstop, else a different, spurious tilt is introduced
671 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
672 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.08f); // same as lowstop
673 }
674
675 // Fudge factor is 1f by default, we're setting it to 0. We don't want it to Fudge or the
676 // capped cyllinder will fall over
677 d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f);
678 d.JointSetAMotorParam(Amotor, (int)dParam.FMax, tensor);
679
680 //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
681 //d.QfromR(
682 //d.Matrix3 checkrotation = new d.Matrix3(0.7071068,0.5, -0.7071068,
683 //
684 //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
685 //standupStraight();
686 }
687
688 //
689 /// <summary>
690 /// Uses the capped cyllinder volume formula to calculate the avatar's mass.
691 /// This may be used in calculations in the scene/scenepresence
692 /// </summary>
693 public override float Mass
694 {
695 get
696 {
697 float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
698 return m_density*AVvolume;
699 }
700 }
701 public override void link(PhysicsActor obj)
702 {
703
704 }
705
706 public override void delink()
707 {
708
709 }
710
711 public override void LockAngularMotion(Vector3 axis)
712 {
713
714 }
715
716// This code is very useful. Written by DanX0r. We're just not using it right now.
717// Commented out to prevent a warning.
718//
719// private void standupStraight()
720// {
721// // The purpose of this routine here is to quickly stabilize the Body while it's popped up in the air.
722// // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you
723// // change appearance and when you enter the simulator
724// // After this routine is done, the amotor stabilizes much quicker
725// d.Vector3 feet;
726// d.Vector3 head;
727// d.BodyGetRelPointPos(Body, 0.0f, 0.0f, -1.0f, out feet);
728// d.BodyGetRelPointPos(Body, 0.0f, 0.0f, 1.0f, out head);
729// float posture = head.Z - feet.Z;
730
731// // restoring force proportional to lack of posture:
732// float servo = (2.5f - posture) * POSTURE_SERVO;
733// d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f);
734// d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f);
735// //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
736// //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
737// }
738
739 public override Vector3 Force
740 {
741 get { return _target_velocity; }
742 set { return; }
743 }
744
745 public override int VehicleType
746 {
747 get { return 0; }
748 set { return; }
749 }
750
751 public override void VehicleFloatParam(int param, float value)
752 {
753
754 }
755
756 public override void VehicleVectorParam(int param, Vector3 value)
757 {
758
759 }
760
761 public override void VehicleRotationParam(int param, Quaternion rotation)
762 {
763
764 }
765
766 public override void VehicleFlags(int flags, bool remove)
767 {
768 }
769
770 public override void SetVolumeDetect(int param)
771 {
772
773 }
774
775 public override Vector3 CenterOfMass
776 {
777 get { return Vector3.Zero; }
778 }
779
780 public override Vector3 GeometricCenter
781 {
782 get { return Vector3.Zero; }
783 }
784
785 public override PrimitiveBaseShape Shape
786 {
787 set { return; }
788 }
789
790 public override Vector3 Velocity
791 {
792 get {
793 // There's a problem with Vector3.Zero! Don't Use it Here!
794 if (_zeroFlag)
795 return Vector3.Zero;
796 m_lastUpdateSent = false;
797 return _velocity;
798 }
799 set
800 {
801 if (value.IsFinite())
802 {
803 m_pidControllerActive = true;
804 _target_velocity = value;
805 }
806 else
807 {
808 m_log.Warn("[PHYSICS]: Got a NaN velocity from Scene in a Character");
809 }
810 }
811 }
812
813 public override Vector3 Torque
814 {
815 get { return Vector3.Zero; }
816 set { return; }
817 }
818
819 public override float CollisionScore
820 {
821 get { return 0f; }
822 set { }
823 }
824
825 public override bool Kinematic
826 {
827 get { return false; }
828 set { }
829 }
830
831 public override Quaternion Orientation
832 {
833 get { return Quaternion.Identity; }
834 set {
835 //Matrix3 or = Orientation.ToRotationMatrix();
836 //d.Matrix3 ord = new d.Matrix3(or.m00, or.m10, or.m20, or.m01, or.m11, or.m21, or.m02, or.m12, or.m22);
837 //d.BodySetRotation(Body, ref ord);
838 }
839 }
840
841 public override Vector3 Acceleration
842 {
843 get { return _acceleration; }
844 }
845
846 public void SetAcceleration(Vector3 accel)
847 {
848 m_pidControllerActive = true;
849 _acceleration = accel;
850 }
851
852 /// <summary>
853 /// Adds the force supplied to the Target Velocity
854 /// The PID controller takes this target velocity and tries to make it a reality
855 /// </summary>
856 /// <param name="force"></param>
857 public override void AddForce(Vector3 force, bool pushforce)
858 {
859 if (force.IsFinite())
860 {
861 if (pushforce)
862 {
863 m_pidControllerActive = false;
864 force *= 100f;
865//Console.WriteLine("DF 1"); // ##
866 if (!force.ApproxEquals(Vector3.Zero, 0.01f))
867 doForce(force);
868 // If uncommented, things get pushed off world
869 //
870 // m_log.Debug("Push!");
871 // _target_velocity.X += force.X;
872 // _target_velocity.Y += force.Y;
873 // _target_velocity.Z += force.Z;
874 }
875 else
876 {
877 m_pidControllerActive = true;
878 _target_velocity.X += force.X;
879 _target_velocity.Y += force.Y;
880 _target_velocity.Z += force.Z;
881 }
882 }
883 else
884 {
885 m_log.Warn("[PHYSICS]: Got a NaN force applied to a Character");
886 }
887 //m_lastUpdateSent = false;
888 }
889
890 public override void AddAngularForce(Vector3 force, bool pushforce)
891 {
892
893 }
894
895 /// <summary>
896 /// After all of the forces add up with 'add force' we apply them with doForce
897 /// </summary>
898 /// <param name="force"></param>
899 public void doForce(Vector3 force)
900 {
901 if (!collidelock)
902 {
903 d.BodyAddForce(Body, force.X, force.Y, force.Z);
904 //d.BodySetRotation(Body, ref m_StandUpRotation);
905 //standupStraight();
906 d.Vector3 vel = d.BodyGetLinearVel(Body); //##
907//Console.WriteLine("AvVel <{0},{1},{2}>", vel.X, vel.Y, vel.Z); //##
908 }
909 }
910
911 public override void SetMomentum(Vector3 momentum)
912 {
913 }
914
915
916 /// <summary>
917 /// Called from Simulate
918 /// This is the avatar's movement control + PID Controller
919 /// </summary>
920 /// <param name="timeStep"></param>
921 public void Move(float timeStep, List<OdeCharacter> defects)
922 {
923 // no lock; for now it's only called from within Simulate()
924
925 // If the PID Controller isn't active then we set our force
926 // calculating base velocity to the current position
927
928 if (Body == IntPtr.Zero)
929 return;
930
931 if (m_pidControllerActive == false)
932 {
933 _zeroPosition = d.BodyGetPosition(Body);
934 }
935 //PidStatus = true;
936
937 d.Vector3 localpos = d.BodyGetPosition(Body);
938 Vector3 localPos = new Vector3(localpos.X, localpos.Y, localpos.Z);
939
940 if (!localPos.IsFinite())
941 {
942
943 m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
944 defects.Add(this);
945 // _parent_scene.RemoveCharacter(this);
946
947 // destroy avatar capsule and related ODE data
948 if (Amotor != IntPtr.Zero)
949 {
950 // Kill the Amotor
951 d.JointDestroy(Amotor);
952 Amotor = IntPtr.Zero;
953 }
954
955 //kill the Geometry
956 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
957
958 if (Body != IntPtr.Zero)
959 {
960 //kill the body
961 d.BodyDestroy(Body);
962
963 Body = IntPtr.Zero;
964 }
965
966 if(Shell != IntPtr.Zero)
967 {
968 try
969 {
970 d.GeomDestroy(Shell);
971 }
972 catch (System.AccessViolationException)
973 {
974 m_log.Error("[PHYSICS]: PrimGeom dead");
975 }
976 // Remove any old entries
977//string tShell;
978//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
979//Console.WriteLine("**** Remove {0}", tShell);
980
981 if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
982 if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
983 Shell = IntPtr.Zero;
984 }
985
986 return;
987 }
988
989 Vector3 vec = Vector3.Zero;
990 d.Vector3 vel = d.BodyGetLinearVel(Body);
991
992 float movementdivisor = 1f;
993
994 if (!m_alwaysRun)
995 {
996 movementdivisor = walkDivisor;
997 }
998 else
999 {
1000 movementdivisor = runDivisor;
1001 }
1002
1003 // if velocity is zero, use position control; otherwise, velocity control
1004 if (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f && m_iscolliding)
1005 {
1006 // keep track of where we stopped. No more slippin' & slidin'
1007 if (!_zeroFlag)
1008 {
1009 _zeroFlag = true;
1010 _zeroPosition = d.BodyGetPosition(Body);
1011 }
1012 if (m_pidControllerActive)
1013 {
1014 // We only want to deactivate the PID Controller if we think we want to have our surrogate
1015 // react to the physics scene by moving it's position.
1016 // Avatar to Avatar collisions
1017 // Prim to avatar collisions
1018
1019 d.Vector3 pos = d.BodyGetPosition(Body);
1020 float errX = _zeroPosition.X - pos.X;
1021 float errY = _zeroPosition.Y - pos.Y;
1022 if( (Math.Abs(errX) > 0.1f) || (Math.Abs(errY) > 0.1f) )
1023 {
1024 vec.X = (_target_velocity.X - vel.X) * (PID_D) + (errX) * (PID_P * 2);
1025 vec.Y = (_target_velocity.Y - vel.Y) * (PID_D) + (errY) * (PID_P * 2);
1026 }
1027 else
1028 { // close, jump to lateral destination
1029 d.BodySetPosition(Body, _zeroPosition.X, _zeroPosition.Y, pos.Z);
1030 }
1031// if (flying)
1032 if (flying || jumping) // add for jumping
1033 {
1034 vec.Z = (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
1035 }
1036 }
1037 //PidStatus = true;
1038 }
1039 else
1040 {
1041 m_pidControllerActive = true;
1042 _zeroFlag = false;
1043 if (m_iscolliding && !flying)
1044 {
1045 // We're standing on something
1046 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D);
1047 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D);
1048 }
1049 else if (m_iscolliding && flying)
1050 {
1051 // We're flying and colliding with something
1052 vec.X = ((_target_velocity.X/movementdivisor) - vel.X)*(PID_D / 16);
1053 vec.Y = ((_target_velocity.Y/movementdivisor) - vel.Y)*(PID_D / 16);
1054 }
1055 else if (!m_iscolliding && flying)
1056 {
1057 // we're in mid air suspended
1058 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6);
1059 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6);
1060 }
1061
1062 if (m_iscolliding && !flying && _target_velocity.Z > 0.0f)
1063 {
1064 // We're colliding with something and we're not flying but we're moving
1065 // This means we're walking or running.
1066 d.Vector3 pos = d.BodyGetPosition(Body);
1067 vec.Z = (_target_velocity.Z - vel.Z)*PID_D + (_zeroPosition.Z - pos.Z)*PID_P;
1068 if (_target_velocity.X > 0)
1069 {
1070 vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
1071 }
1072 if (_target_velocity.Y > 0)
1073 {
1074 vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D;
1075 }
1076 }
1077 else if (!m_iscolliding && !flying)
1078 {
1079 // we're not colliding and we're not flying so that means we're falling!
1080 // m_iscolliding includes collisions with the ground.
1081
1082 // d.Vector3 pos = d.BodyGetPosition(Body);
1083 if (Math.Abs(_target_velocity.X) > 0)
1084 {
1085 vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
1086 }
1087 if (Math.Abs(_target_velocity.Y) > 0)
1088 {
1089 vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D;
1090 }
1091 }
1092
1093 if (flying)
1094 {
1095 vec.Z = (_target_velocity.Z - vel.Z) * (PID_D);
1096 }
1097 }
1098 if (flying)
1099 {
1100 vec.Z += ((-1 * _parent_scene.gravityz)*m_mass);
1101
1102 //Added for auto fly height. Kitto Flora
1103 //d.Vector3 pos = d.BodyGetPosition(Body);
1104 float target_altitude = _parent_scene.GetTerrainHeightAtXY(_position.X, _position.Y) + MinimumGroundFlightOffset;
1105
1106 if (_position.Z < target_altitude)
1107 {
1108 vec.Z += (target_altitude - _position.Z) * PID_P * 5.0f;
1109 }
1110 // end add Kitto Flora
1111 }
1112 if (vec.IsFinite())
1113 {
1114 if (!vec.ApproxEquals(Vector3.Zero, 0.02f)) // 0.01 allows 0.002 !!
1115 {
1116//Console.WriteLine("DF 2"); // ##
1117
1118 doForce(vec);
1119 if (!_zeroFlag)
1120 {
1121// AlignAvatarTiltWithCurrentDirectionOfMovement(vec);
1122 }
1123 }
1124 }
1125 else
1126 {
1127 m_log.Warn("[PHYSICS]: Got a NaN force vector in Move()");
1128 m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
1129 defects.Add(this);
1130 // _parent_scene.RemoveCharacter(this);
1131 // destroy avatar capsule and related ODE data
1132 if (Amotor != IntPtr.Zero)
1133 {
1134 // Kill the Amotor
1135 d.JointDestroy(Amotor);
1136 Amotor = IntPtr.Zero;
1137 }
1138 //kill the Geometry
1139 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
1140
1141 if (Body != IntPtr.Zero)
1142 {
1143 //kill the body
1144 d.BodyDestroy(Body);
1145
1146 Body = IntPtr.Zero;
1147 }
1148
1149 if(Shell != IntPtr.Zero)
1150 {
1151 try
1152 {
1153 d.GeomDestroy(Shell);
1154 }
1155 catch (System.AccessViolationException)
1156 {
1157 m_log.Error("[PHYSICS]: PrimGeom dead");
1158 }
1159 // Remove any old entries
1160//string tShell;
1161//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
1162//Console.WriteLine("**** Remove {0}", tShell);
1163
1164 if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
1165 if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
1166 Shell = IntPtr.Zero;
1167 }
1168 }
1169 }
1170
1171 /// <summary>
1172 /// Updates the reported position and velocity. This essentially sends the data up to ScenePresence.
1173 /// </summary>
1174 public void UpdatePositionAndVelocity()
1175 {
1176 // no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit!
1177 d.Vector3 vec;
1178 try
1179 {
1180 vec = d.BodyGetPosition(Body);
1181 }
1182 catch (NullReferenceException)
1183 {
1184 bad = true;
1185 _parent_scene.BadCharacter(this);
1186 vec = new d.Vector3(_position.X, _position.Y, _position.Z);
1187 base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
1188 m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar {0}, physical actor {1}", m_name, m_uuid);
1189 }
1190
1191
1192 // kluge to keep things in bounds. ODE lets dead avatars drift away (they should be removed!)
1193 if (vec.X < 0.0f) vec.X = 0.0f;
1194 if (vec.Y < 0.0f) vec.Y = 0.0f;
1195 if (vec.X > (int)_parent_scene.WorldExtents.X - 0.05f) vec.X = (int)_parent_scene.WorldExtents.X - 0.05f;
1196 if (vec.Y > (int)_parent_scene.WorldExtents.Y - 0.05f) vec.Y = (int)_parent_scene.WorldExtents.Y - 0.05f;
1197
1198 _position.X = vec.X;
1199 _position.Y = vec.Y;
1200 _position.Z = vec.Z;
1201
1202 // Did we move last? = zeroflag
1203 // This helps keep us from sliding all over
1204
1205 if (_zeroFlag)
1206 {
1207 _velocity.X = 0.0f;
1208 _velocity.Y = 0.0f;
1209 _velocity.Z = 0.0f;
1210
1211 // Did we send out the 'stopped' message?
1212 if (!m_lastUpdateSent)
1213 {
1214 m_lastUpdateSent = true;
1215 //base.RequestPhysicsterseUpdate();
1216
1217 }
1218 }
1219 else
1220 {
1221 m_lastUpdateSent = false;
1222 try
1223 {
1224 vec = d.BodyGetLinearVel(Body);
1225 }
1226 catch (NullReferenceException)
1227 {
1228 vec.X = _velocity.X;
1229 vec.Y = _velocity.Y;
1230 vec.Z = _velocity.Z;
1231 }
1232 _velocity.X = (vec.X);
1233 _velocity.Y = (vec.Y);
1234
1235 _velocity.Z = (vec.Z);
1236
1237 if (_velocity.Z < -6 && !m_hackSentFall)
1238 {
1239 m_hackSentFall = true;
1240 m_pidControllerActive = false;
1241 }
1242 else if (flying && !m_hackSentFly)
1243 {
1244 //m_hackSentFly = true;
1245 //base.SendCollisionUpdate(new CollisionEventUpdate());
1246 }
1247 else
1248 {
1249 m_hackSentFly = false;
1250 m_hackSentFall = false;
1251 }
1252 }
1253 }
1254
1255 /// <summary>
1256 /// Cleanup the things we use in the scene.
1257 /// </summary>
1258 public void Destroy()
1259 {
1260 m_tainted_isPhysical = false;
1261 _parent_scene.AddPhysicsActorTaint(this);
1262 }
1263
1264 public override void CrossingFailure()
1265 {
1266 }
1267
1268 public override Vector3 PIDTarget { set { return; } }
1269 public override bool PIDActive { set { return; } }
1270 public override float PIDTau { set { return; } }
1271
1272 public override float PIDHoverHeight { set { return; } }
1273 public override bool PIDHoverActive { set { return; } }
1274 public override PIDHoverType PIDHoverType { set { return; } }
1275 public override float PIDHoverTau { set { return; } }
1276
1277 public override Quaternion APIDTarget{ set { return; } }
1278
1279 public override bool APIDActive{ set { return; } }
1280
1281 public override float APIDStrength{ set { return; } }
1282
1283 public override float APIDDamping{ set { return; } }
1284
1285
1286 public override void SubscribeEvents(int ms)
1287 {
1288 m_requestedUpdateFrequency = ms;
1289 m_eventsubscription = ms;
1290 _parent_scene.addCollisionEventReporting(this);
1291 }
1292 public override void UnSubscribeEvents()
1293 {
1294 _parent_scene.remCollisionEventReporting(this);
1295 m_requestedUpdateFrequency = 0;
1296 m_eventsubscription = 0;
1297 }
1298 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
1299 {
1300 if (m_eventsubscription > 0)
1301 {
1302 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
1303 }
1304 }
1305
1306 public void SendCollisions()
1307 {
1308 if (m_eventsubscription > m_requestedUpdateFrequency)
1309 {
1310 if (CollisionEventsThisFrame != null)
1311 {
1312 base.SendCollisionUpdate(CollisionEventsThisFrame);
1313 }
1314 CollisionEventsThisFrame = new CollisionEventUpdate();
1315 m_eventsubscription = 0;
1316 }
1317 }
1318 public override bool SubscribedEvents()
1319 {
1320 if (m_eventsubscription > 0)
1321 return true;
1322 return false;
1323 }
1324
1325 public void ProcessTaints(float timestep)
1326 {
1327 lock (m_syncRoot)
1328 {
1329
1330 if (m_tainted_isPhysical != m_isPhysical)
1331 {
1332 if (m_tainted_isPhysical)
1333 {
1334 // Create avatar capsule and related ODE data
1335 if (!(Shell == IntPtr.Zero && Body == IntPtr.Zero && Amotor == IntPtr.Zero))
1336 {
1337 m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - "
1338 + (Shell!=IntPtr.Zero ? "Shell ":"")
1339 + (Body!=IntPtr.Zero ? "Body ":"")
1340 + (Amotor!=IntPtr.Zero ? "Amotor ":""));
1341 }
1342 AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor);
1343 _parent_scene.AddCharacter(this);
1344 }
1345 else
1346 {
1347 _parent_scene.RemoveCharacter(this);
1348 // destroy avatar capsule and related ODE data
1349 if (Amotor != IntPtr.Zero)
1350 {
1351 // Kill the Amotor
1352 d.JointDestroy(Amotor);
1353 Amotor = IntPtr.Zero;
1354 }
1355 //kill the Geometry
1356 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
1357
1358 if (Body != IntPtr.Zero)
1359 {
1360 //kill the body
1361 d.BodyDestroy(Body);
1362 Body = IntPtr.Zero;
1363 }
1364
1365 if(Shell != IntPtr.Zero)
1366 {
1367 try
1368 {
1369 d.GeomDestroy(Shell);
1370 }
1371 catch (System.AccessViolationException)
1372 {
1373 m_log.Error("[PHYSICS]: PrimGeom dead");
1374 }
1375 // Remove any old entries
1376 //string tShell;
1377 //_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
1378 //Console.WriteLine("**** Remove {0}", tShell);
1379
1380 if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
1381 if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
1382 Shell = IntPtr.Zero;
1383 }
1384 }
1385
1386 m_isPhysical = m_tainted_isPhysical;
1387 }
1388
1389 if (m_tainted_CAPSULE_LENGTH != CAPSULE_LENGTH)
1390 {
1391 if (Shell != IntPtr.Zero && Body != IntPtr.Zero && Amotor != IntPtr.Zero)
1392 {
1393
1394 m_pidControllerActive = true;
1395 // no lock needed on _parent_scene.OdeLock because we are called from within the thread lock in OdePlugin's simulate()
1396 d.JointDestroy(Amotor);
1397 float prevCapsule = CAPSULE_LENGTH;
1398 CAPSULE_LENGTH = m_tainted_CAPSULE_LENGTH;
1399 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
1400 d.BodyDestroy(Body);
1401 AvatarGeomAndBodyCreation(_position.X, _position.Y,
1402 _position.Z + (Math.Abs(CAPSULE_LENGTH - prevCapsule) * 2), m_tensor);
1403 Velocity = Vector3.Zero;
1404 }
1405 else
1406 {
1407 m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - "
1408 + (Shell==IntPtr.Zero ? "Shell ":"")
1409 + (Body==IntPtr.Zero ? "Body ":"")
1410 + (Amotor==IntPtr.Zero ? "Amotor ":""));
1411 }
1412 }
1413
1414 if (!m_taintPosition.ApproxEquals(_position, 0.05f))
1415 {
1416 if (Body != IntPtr.Zero)
1417 {
1418 d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
1419
1420 _position.X = m_taintPosition.X;
1421 _position.Y = m_taintPosition.Y;
1422 _position.Z = m_taintPosition.Z;
1423 }
1424 }
1425
1426 }
1427 }
1428
1429 internal void AddCollisionFrameTime(int p)
1430 {
1431 // protect it from overflow crashing
1432 if (m_eventsubscription + p >= int.MaxValue)
1433 m_eventsubscription = 0;
1434 m_eventsubscription += p;
1435 }
1436 }
1437}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
new file mode 100644
index 0000000..793774a
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -0,0 +1,3917 @@
1/* Copyright (c) Contributors, http://opensimulator.org/
2 * See CONTRIBUTORS.TXT for a full list of copyright holders.
3 * Redistribution and use in source and binary forms, with or without
4 * modification, are permitted provided that the following conditions are met:
5 * * Redistributions of source code must retain the above copyright
6 * notice, this list of conditions and the following disclaimer.
7 * * Redistributions in binary form must reproduce the above copyright
8 * notice, this list of conditions and the following disclaimer in the
9 * documentation and/or other materials provided with the distribution.
10 * * Neither the name of the OpenSimulator Project nor the
11 * names of its contributors may be used to endorse or promote products
12 * derived from this software without specific prior written permission.
13 *
14 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * Revised March 5th 2010 by Kitto Flora. ODEDynamics.cs
26 * rolled into ODEPrim.cs
27 */
28
29using System;
30using System.Collections.Generic;
31using System.Reflection;
32using System.Runtime.InteropServices;
33using System.Threading;
34using log4net;
35using OpenMetaverse;
36using Ode.NET;
37using OpenSim.Framework;
38using OpenSim.Region.Physics.Manager;
39
40
41namespace OpenSim.Region.Physics.OdePlugin
42{
43 /// <summary>
44 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
45 /// </summary>
46
47 public class OdePrim : PhysicsActor
48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 private Vector3 _position;
52 private Vector3 _velocity;
53 private Vector3 _torque;
54 private Vector3 m_lastVelocity;
55 private Vector3 m_lastposition;
56 private Quaternion m_lastorientation = new Quaternion();
57 private Vector3 m_rotationalVelocity;
58 private Vector3 _size;
59 private Vector3 _acceleration;
60 // private d.Vector3 _zeroPosition = new d.Vector3(0.0f, 0.0f, 0.0f);
61 private Quaternion _orientation;
62 private Vector3 m_taintposition;
63 private Vector3 m_taintsize;
64 private Vector3 m_taintVelocity;
65 private Vector3 m_taintTorque;
66 private Quaternion m_taintrot;
67 private Vector3 m_rotateEnable = Vector3.One; // Current setting
68 private Vector3 m_rotateEnableRequest = Vector3.One; // Request from LSL
69 private bool m_rotateEnableUpdate = false;
70 private Vector3 m_lockX;
71 private Vector3 m_lockY;
72 private Vector3 m_lockZ;
73 private IntPtr Amotor = IntPtr.Zero;
74 private IntPtr AmotorX = IntPtr.Zero;
75 private IntPtr AmotorY = IntPtr.Zero;
76 private IntPtr AmotorZ = IntPtr.Zero;
77
78 private Vector3 m_PIDTarget;
79 private float m_PIDTau;
80 private float PID_D = 35f;
81 private float PID_G = 25f;
82 private bool m_usePID = false;
83
84 private Quaternion m_APIDTarget = new Quaternion();
85 private float m_APIDStrength = 0.5f;
86 private float m_APIDDamping = 0.5f;
87 private bool m_useAPID = false;
88
89 // These next 7 params apply to llSetHoverHeight(float height, integer water, float tau),
90 // do not confuse with VEHICLE HOVER
91
92 private float m_PIDHoverHeight;
93 private float m_PIDHoverTau;
94 private bool m_useHoverPID;
95 private PIDHoverType m_PIDHoverType = PIDHoverType.Ground;
96 private float m_targetHoverHeight;
97 private float m_groundHeight;
98 private float m_waterHeight;
99 private float m_buoyancy; //m_buoyancy set by llSetBuoyancy()
100
101 // private float m_tensor = 5f;
102 private int body_autodisable_frames = 20;
103
104
105 private const CollisionCategories m_default_collisionFlags = (CollisionCategories.Geom
106 | CollisionCategories.Space
107 | CollisionCategories.Body
108 | CollisionCategories.Character
109 );
110 private bool m_taintshape;
111 private bool m_taintPhysics;
112 private bool m_collidesLand = true;
113 private bool m_collidesWater;
114 public bool m_returnCollisions;
115
116 // Default we're a Geometry
117 private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
118
119 // Default, Collide with Other Geometries, spaces and Bodies
120 private CollisionCategories m_collisionFlags = m_default_collisionFlags;
121
122 public bool m_taintremove;
123 public bool m_taintdisable;
124 public bool m_disabled;
125 public bool m_taintadd;
126 public bool m_taintselected;
127 public bool m_taintCollidesWater;
128
129 public uint m_localID;
130
131 //public GCHandle gc;
132 private CollisionLocker ode;
133
134 private bool m_meshfailed = false;
135 private bool m_taintforce = false;
136 private bool m_taintaddangularforce = false;
137 private Vector3 m_force;
138 private List<Vector3> m_forcelist = new List<Vector3>();
139 private List<Vector3> m_angularforcelist = new List<Vector3>();
140
141 private IMesh _mesh;
142 private PrimitiveBaseShape _pbs;
143 private OdeScene _parent_scene;
144 public IntPtr m_targetSpace = IntPtr.Zero;
145 public IntPtr prim_geom;
146// public IntPtr prev_geom;
147 public IntPtr _triMeshData;
148
149 private IntPtr _linkJointGroup = IntPtr.Zero;
150 private PhysicsActor _parent;
151 private PhysicsActor m_taintparent;
152
153 private List<OdePrim> childrenPrim = new List<OdePrim>();
154
155 private bool iscolliding;
156 private bool m_isphysical;
157 private bool m_isSelected;
158
159 internal bool m_isVolumeDetect; // If true, this prim only detects collisions but doesn't collide actively
160
161 private bool m_throttleUpdates;
162 private int throttleCounter;
163 public int m_interpenetrationcount;
164 public float m_collisionscore;
165 public int m_roundsUnderMotionThreshold;
166 private int m_crossingfailures;
167
168 public bool outofBounds;
169 private float m_density = 10.000006836f; // Aluminum g/cm3;
170
171 public bool _zeroFlag; // if body has been stopped
172 private bool m_lastUpdateSent;
173
174 public IntPtr Body = IntPtr.Zero;
175 public String m_primName;
176 private Vector3 _target_velocity;
177 public d.Mass pMass;
178
179 public int m_eventsubscription;
180 private CollisionEventUpdate CollisionEventsThisFrame;
181
182 private IntPtr m_linkJoint = IntPtr.Zero;
183
184 public volatile bool childPrim;
185
186 internal int m_material = (int)Material.Wood;
187
188 private int frcount = 0; // Used to limit dynamics debug output to
189 private int revcount = 0; // Reverse motion while > 0
190
191 private IntPtr m_body = IntPtr.Zero;
192
193 // Vehicle properties ============================================================================================
194 private Vehicle m_type = Vehicle.TYPE_NONE; // If a 'VEHICLE', and what kind
195 // private Quaternion m_referenceFrame = Quaternion.Identity; // Axis modifier
196 private VehicleFlag m_flags = (VehicleFlag) 0; // Bit settings:
197 // HOVER_TERRAIN_ONLY
198 // HOVER_GLOBAL_HEIGHT
199 // NO_DEFLECTION_UP
200 // HOVER_WATER_ONLY
201 // HOVER_UP_ONLY
202 // LIMIT_MOTOR_UP
203 // LIMIT_ROLL_ONLY
204
205 // Linear properties
206 private Vector3 m_linearMotorDirection = Vector3.Zero; // (was m_linearMotorDirectionLASTSET) the (local) Velocity
207 //requested by LSL
208 private float m_linearMotorTimescale = 0; // Motor Attack rate set by LSL
209 private float m_linearMotorDecayTimescale = 0; // Motor Decay rate set by LSL
210 private Vector3 m_linearFrictionTimescale = Vector3.Zero; // General Friction set by LSL
211
212 private Vector3 m_lLinMotorDVel = Vector3.Zero; // decayed motor
213 private Vector3 m_lLinObjectVel = Vector3.Zero; // local frame object velocity
214 private Vector3 m_wLinObjectVel = Vector3.Zero; // world frame object velocity
215
216 //Angular properties
217 private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
218
219 private float m_angularMotorTimescale = 0; // motor angular Attack rate set by LSL
220 private float m_angularMotorDecayTimescale = 0; // motor angular Decay rate set by LSL
221 private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular Friction set by LSL
222
223 private Vector3 m_angularMotorDVel = Vector3.Zero; // decayed angular motor
224// private Vector3 m_angObjectVel = Vector3.Zero; // current body angular velocity
225 private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body
226
227 //Deflection properties
228 // private float m_angularDeflectionEfficiency = 0;
229 // private float m_angularDeflectionTimescale = 0;
230 // private float m_linearDeflectionEfficiency = 0;
231 // private float m_linearDeflectionTimescale = 0;
232
233 //Banking properties
234 // private float m_bankingEfficiency = 0;
235 // private float m_bankingMix = 0;
236 // private float m_bankingTimescale = 0;
237
238 //Hover and Buoyancy properties
239 private float m_VhoverHeight = 0f;
240// private float m_VhoverEfficiency = 0f;
241 private float m_VhoverTimescale = 0f;
242 private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
243 private float m_VehicleBuoyancy = 0f; // Set by VEHICLE_BUOYANCY, for a vehicle.
244 // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
245 // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
246 // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
247
248 //Attractor properties
249 private float m_verticalAttractionEfficiency = 1.0f; // damped
250 private float m_verticalAttractionTimescale = 500f; // Timescale > 300 means no vert attractor.
251
252
253
254
255
256
257 public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,
258 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
259 {
260 ode = dode;
261 if (!pos.IsFinite())
262 {
263 pos = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f),
264 parent_scene.GetTerrainHeightAtXY(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f)) + 0.5f);
265 m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
266 }
267
268 _position = pos;
269 m_taintposition = pos;
270 PID_D = parent_scene.bodyPIDD;
271 PID_G = parent_scene.bodyPIDG;
272 m_density = parent_scene.geomDefaultDensity;
273 // m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
274 body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
275
276
277 prim_geom = IntPtr.Zero;
278// prev_geom = IntPtr.Zero;
279
280 if (!pos.IsFinite())
281 {
282 size = new Vector3(0.5f, 0.5f, 0.5f);
283 m_log.Warn("[PHYSICS]: Got nonFinite Object create Size");
284 }
285
286 if (size.X <= 0) size.X = 0.01f;
287 if (size.Y <= 0) size.Y = 0.01f;
288 if (size.Z <= 0) size.Z = 0.01f;
289
290 _size = size;
291 m_taintsize = _size;
292
293 if (!QuaternionIsFinite(rotation))
294 {
295 rotation = Quaternion.Identity;
296 m_log.Warn("[PHYSICS]: Got nonFinite Object create Rotation");
297 }
298
299 _orientation = rotation;
300 m_taintrot = _orientation;
301 _mesh = mesh;
302 _pbs = pbs;
303
304 _parent_scene = parent_scene;
305 m_targetSpace = (IntPtr)0;
306
307// if (pos.Z < 0)
308 if (pos.Z < parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y))
309 m_isphysical = false;
310 else
311 {
312 m_isphysical = pisPhysical;
313 // If we're physical, we need to be in the master space for now.
314 // linksets *should* be in a space together.. but are not currently
315 if (m_isphysical)
316 m_targetSpace = _parent_scene.space;
317 }
318 m_primName = primName;
319 m_taintadd = true;
320 _parent_scene.AddPhysicsActorTaint(this);
321 // don't do .add() here; old geoms get recycled with the same hash
322 }
323
324 public override int PhysicsActorType
325 {
326 get { return (int) ActorTypes.Prim; }
327 set { return; }
328 }
329
330 public override bool SetAlwaysRun
331 {
332 get { return false; }
333 set { return; }
334 }
335
336 public override uint LocalID
337 {
338 set {
339 //m_log.Info("[PHYSICS]: Setting TrackerID: " + value);
340 m_localID = value; }
341 }
342
343 public override bool Grabbed
344 {
345 set { return; }
346 }
347
348 public override bool Selected
349 {
350 set {
351
352//Console.WriteLine("Sel {0} {1} {2}", m_primName, value, m_isphysical);
353 // This only makes the object not collidable if the object
354 // is physical or the object is modified somehow *IN THE FUTURE*
355 // without this, if an avatar selects prim, they can walk right
356 // through it while it's selected
357 m_collisionscore = 0;
358 if ((m_isphysical && !_zeroFlag) || !value)
359 {
360 m_taintselected = value;
361 _parent_scene.AddPhysicsActorTaint(this);
362 }
363 else
364 {
365 m_taintselected = value;
366 m_isSelected = value;
367 }
368 if(m_isSelected) disableBodySoft();
369 }
370 }
371
372 public override bool IsPhysical
373 {
374 get { return m_isphysical; }
375 set
376 {
377 m_isphysical = value;
378 if (!m_isphysical)
379 { // Zero the remembered last velocity
380 m_lastVelocity = Vector3.Zero;
381 if (m_type != Vehicle.TYPE_NONE) Halt();
382 }
383 }
384 }
385
386 public void setPrimForRemoval()
387 {
388 m_taintremove = true;
389 }
390
391 public override bool Flying
392 {
393 // no flying prims for you
394 get { return false; }
395 set { }
396 }
397
398 public override bool IsColliding
399 {
400 get { return iscolliding; }
401 set { iscolliding = value; }
402 }
403
404 public override bool CollidingGround
405 {
406 get { return false; }
407 set { return; }
408 }
409
410 public override bool CollidingObj
411 {
412 get { return false; }
413 set { return; }
414 }
415
416 public override bool ThrottleUpdates
417 {
418 get { return m_throttleUpdates; }
419 set { m_throttleUpdates = value; }
420 }
421
422 public override bool Stopped
423 {
424 get { return _zeroFlag; }
425 }
426
427 public override Vector3 Position
428 {
429 get { return _position; }
430
431 set { _position = value;
432 //m_log.Info("[PHYSICS]: " + _position.ToString());
433 }
434 }
435
436 public override Vector3 Size
437 {
438 get { return _size; }
439 set
440 {
441 if (value.IsFinite())
442 {
443 _size = value;
444 }
445 else
446 {
447 m_log.Warn("[PHYSICS]: Got NaN Size on object");
448 }
449 }
450 }
451
452 public override float Mass
453 {
454 get { return CalculateMass(); }
455 }
456
457 public override Vector3 Force
458 {
459 //get { return Vector3.Zero; }
460 get { return m_force; }
461 set
462 {
463 if (value.IsFinite())
464 {
465 m_force = value;
466 }
467 else
468 {
469 m_log.Warn("[PHYSICS]: NaN in Force Applied to an Object");
470 }
471 }
472 }
473
474 public override int VehicleType
475 {
476 get { return (int)m_type; }
477 set { ProcessTypeChange((Vehicle)value); }
478 }
479
480 public override void VehicleFloatParam(int param, float value)
481 {
482 ProcessFloatVehicleParam((Vehicle) param, value);
483 }
484
485 public override void VehicleVectorParam(int param, Vector3 value)
486 {
487 ProcessVectorVehicleParam((Vehicle) param, value);
488 }
489
490 public override void VehicleRotationParam(int param, Quaternion rotation)
491 {
492 ProcessRotationVehicleParam((Vehicle) param, rotation);
493 }
494
495 public override void VehicleFlags(int param, bool remove)
496 {
497 ProcessVehicleFlags(param, remove);
498 }
499
500 public override void SetVolumeDetect(int param)
501 {
502 lock (_parent_scene.OdeLock)
503 {
504 m_isVolumeDetect = (param!=0);
505 }
506 }
507
508 public override Vector3 CenterOfMass
509 {
510 get { return Vector3.Zero; }
511 }
512
513 public override Vector3 GeometricCenter
514 {
515 get { return Vector3.Zero; }
516 }
517
518 public override PrimitiveBaseShape Shape
519 {
520 set
521 {
522 _pbs = value;
523 m_taintshape = true;
524 }
525 }
526
527 public override Vector3 Velocity
528 {
529 get
530 {
531 // Averate previous velocity with the new one so
532 // client object interpolation works a 'little' better
533 if (_zeroFlag)
534 return Vector3.Zero;
535
536 Vector3 returnVelocity = Vector3.Zero;
537 returnVelocity.X = (m_lastVelocity.X + _velocity.X)/2;
538 returnVelocity.Y = (m_lastVelocity.Y + _velocity.Y)/2;
539 returnVelocity.Z = (m_lastVelocity.Z + _velocity.Z)/2;
540 return returnVelocity;
541 }
542 set
543 {
544 if (value.IsFinite())
545 {
546 _velocity = value;
547
548 m_taintVelocity = value;
549 _parent_scene.AddPhysicsActorTaint(this);
550 }
551 else
552 {
553 m_log.Warn("[PHYSICS]: Got NaN Velocity in Object");
554 }
555
556 }
557 }
558
559 public override Vector3 Torque
560 {
561 get
562 {
563 if (!m_isphysical || Body == IntPtr.Zero)
564 return Vector3.Zero;
565
566 return _torque;
567 }
568
569 set
570 {
571 if (value.IsFinite())
572 {
573 m_taintTorque = value;
574 _parent_scene.AddPhysicsActorTaint(this);
575 }
576 else
577 {
578 m_log.Warn("[PHYSICS]: Got NaN Torque in Object");
579 }
580 }
581 }
582
583 public override float CollisionScore
584 {
585 get { return m_collisionscore; }
586 set { m_collisionscore = value; }
587 }
588
589 public override bool Kinematic
590 {
591 get { return false; }
592 set { }
593 }
594
595 public override Quaternion Orientation
596 {
597 get { return _orientation; }
598 set
599 {
600 if (QuaternionIsFinite(value))
601 {
602 _orientation = value;
603 }
604 else
605 m_log.Warn("[PHYSICS]: Got NaN quaternion Orientation from Scene in Object");
606
607 }
608 }
609
610
611 public override bool FloatOnWater
612 {
613 set {
614 m_taintCollidesWater = value;
615 _parent_scene.AddPhysicsActorTaint(this);
616 }
617 }
618
619 public override void SetMomentum(Vector3 momentum)
620 {
621 }
622
623 public override Vector3 PIDTarget
624 {
625 set
626 {
627 if (value.IsFinite())
628 {
629 m_PIDTarget = value;
630 }
631 else
632 m_log.Warn("[PHYSICS]: Got NaN PIDTarget from Scene on Object");
633 }
634 }
635 public override bool PIDActive { set { m_usePID = value; } }
636 public override float PIDTau { set { m_PIDTau = value; } }
637
638 // For RotLookAt
639 public override Quaternion APIDTarget { set { m_APIDTarget = value; } }
640 public override bool APIDActive { set { m_useAPID = value; } }
641 public override float APIDStrength { set { m_APIDStrength = value; } }
642 public override float APIDDamping { set { m_APIDDamping = value; } }
643
644 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
645 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
646 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
647 public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
648
649 internal static bool QuaternionIsFinite(Quaternion q)
650 {
651 if (Single.IsNaN(q.X) || Single.IsInfinity(q.X))
652 return false;
653 if (Single.IsNaN(q.Y) || Single.IsInfinity(q.Y))
654 return false;
655 if (Single.IsNaN(q.Z) || Single.IsInfinity(q.Z))
656 return false;
657 if (Single.IsNaN(q.W) || Single.IsInfinity(q.W))
658 return false;
659 return true;
660 }
661
662 public override Vector3 Acceleration // client updates read data via here
663 {
664 get { return _acceleration; }
665 }
666
667
668 public void SetAcceleration(Vector3 accel) // No one calls this, and it would not do anything.
669 {
670 _acceleration = accel;
671 }
672
673 public override void AddForce(Vector3 force, bool pushforce)
674 {
675 if (force.IsFinite())
676 {
677 lock (m_forcelist)
678 m_forcelist.Add(force);
679
680 m_taintforce = true;
681 }
682 else
683 {
684 m_log.Warn("[PHYSICS]: Got Invalid linear force vector from Scene in Object");
685 }
686 //m_log.Info("[PHYSICS]: Added Force:" + force.ToString() + " to prim at " + Position.ToString());
687 }
688
689 public override void AddAngularForce(Vector3 force, bool pushforce)
690 {
691 if (force.IsFinite())
692 {
693 m_angularforcelist.Add(force);
694 m_taintaddangularforce = true;
695 }
696 else
697 {
698 m_log.Warn("[PHYSICS]: Got Invalid Angular force vector from Scene in Object");
699 }
700 }
701
702 public override Vector3 RotationalVelocity
703 {
704 get
705 {
706 return m_rotationalVelocity;
707 }
708 set
709 {
710 if (value.IsFinite())
711 {
712 m_rotationalVelocity = value;
713 }
714 else
715 {
716 m_log.Warn("[PHYSICS]: Got NaN RotationalVelocity in Object");
717 }
718 }
719 }
720
721 public override void CrossingFailure()
722 {
723 m_crossingfailures++;
724 if (m_crossingfailures > _parent_scene.geomCrossingFailuresBeforeOutofbounds)
725 {
726 base.RaiseOutOfBounds(_position);
727 return;
728 }
729 else if (m_crossingfailures == _parent_scene.geomCrossingFailuresBeforeOutofbounds)
730 {
731 m_log.Warn("[PHYSICS]: Too many crossing failures for: " + m_primName);
732 }
733 }
734
735 public override float Buoyancy
736 {
737 get { return m_buoyancy; }
738// set { m_buoyancy = value; }
739 set {
740 m_buoyancy = value;
741
742 Console.WriteLine("m_buoyancy={0}", m_buoyancy);
743 }
744 }
745
746 public override void link(PhysicsActor obj)
747 {
748 m_taintparent = obj;
749 }
750
751 public override void delink()
752 {
753 m_taintparent = null;
754 }
755
756 public override void LockAngularMotion(Vector3 axis)
757 {
758 // This is actually ROTATION ENABLE, not a lock.
759 // default is <1,1,1> which is all enabled.
760 // The lock value is updated inside Move(), no point in using the taint system.
761 // OS 'm_taintAngularLock' etc change to m_rotateEnable.
762 if (axis.IsFinite())
763 {
764 axis.X = (axis.X > 0) ? 1f : 0f;
765 axis.Y = (axis.Y > 0) ? 1f : 0f;
766 axis.Z = (axis.Z > 0) ? 1f : 0f;
767 m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z);
768 m_rotateEnableRequest = axis;
769 m_rotateEnableUpdate = true;
770 }
771 else
772 {
773 m_log.Warn("[PHYSICS]: Got NaN locking axis from Scene on Object");
774 }
775 }
776
777
778 public void SetGeom(IntPtr geom)
779 {
780 if(prim_geom != IntPtr.Zero)
781 {
782 // Remove any old entries
783//string tPA;
784//_parent_scene.geom_name_map.TryGetValue(prim_geom, out tPA);
785//Console.WriteLine("**** Remove {0}", tPA);
786 if(_parent_scene.geom_name_map.ContainsKey(prim_geom)) _parent_scene.geom_name_map.Remove(prim_geom);
787 if(_parent_scene.actor_name_map.ContainsKey(prim_geom)) _parent_scene.actor_name_map.Remove(prim_geom);
788 d.GeomDestroy(prim_geom);
789 }
790
791 prim_geom = geom;
792//Console.WriteLine("SetGeom to " + prim_geom + " for " + m_primName);
793 if (prim_geom != IntPtr.Zero)
794 {
795 _parent_scene.geom_name_map[prim_geom] = this.m_primName;
796 _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this;
797 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
798 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
799//Console.WriteLine("**** Create {2} Dicts: actor={0} name={1}", _parent_scene.actor_name_map.Count, _parent_scene.geom_name_map.Count, this.m_primName);
800 }
801
802 if (childPrim)
803 {
804 if (_parent != null && _parent is OdePrim)
805 {
806 OdePrim parent = (OdePrim)_parent;
807//Console.WriteLine("SetGeom calls ChildSetGeom");
808 parent.ChildSetGeom(this);
809 }
810 }
811 //m_log.Warn("Setting Geom to: " + prim_geom);
812 }
813
814 public void enableBodySoft()
815 {
816 if (!childPrim)
817 {
818 if (m_isphysical && Body != IntPtr.Zero)
819 {
820 d.BodyEnable(Body);
821 if (m_type != Vehicle.TYPE_NONE)
822 Enable(Body, _parent_scene);
823 }
824
825 m_disabled = false;
826 }
827 }
828
829 public void disableBodySoft()
830 {
831 m_disabled = true;
832
833 if (m_isphysical && Body != IntPtr.Zero)
834 {
835 d.BodyDisable(Body);
836 Halt();
837 }
838 }
839
840 public void enableBody()
841 {
842 // Don't enable this body if we're a child prim
843 // this should be taken care of in the parent function not here
844 if (!childPrim)
845 {
846 // Sets the geom to a body
847 Body = d.BodyCreate(_parent_scene.world);
848
849 setMass();
850 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
851 d.Quaternion myrot = new d.Quaternion();
852 myrot.X = _orientation.X;
853 myrot.Y = _orientation.Y;
854 myrot.Z = _orientation.Z;
855 myrot.W = _orientation.W;
856 d.BodySetQuaternion(Body, ref myrot);
857 d.GeomSetBody(prim_geom, Body);
858 m_collisionCategories |= CollisionCategories.Body;
859 m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
860
861 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
862 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
863
864 d.BodySetAutoDisableFlag(Body, true);
865 d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
866
867 // disconnect from world gravity so we can apply buoyancy
868 d.BodySetGravityMode (Body, false);
869
870 m_interpenetrationcount = 0;
871 m_collisionscore = 0;
872 m_disabled = false;
873
874 if (m_type != Vehicle.TYPE_NONE)
875 {
876 Enable(Body, _parent_scene);
877 }
878
879 _parent_scene.addActivePrim(this);
880 }
881 }
882
883 #region Mass Calculation
884
885 private float CalculateMass()
886 {
887 float volume = _size.X * _size.Y * _size.Z; // default
888 float tmp;
889
890 float returnMass = 0;
891 float hollowAmount = (float)_pbs.ProfileHollow * 2.0e-5f;
892 float hollowVolume = hollowAmount * hollowAmount;
893
894 switch (_pbs.ProfileShape)
895 {
896 case ProfileShape.Square:
897 // default box
898
899 if (_pbs.PathCurve == (byte)Extrusion.Straight)
900 {
901 if (hollowAmount > 0.0)
902 {
903 switch (_pbs.HollowShape)
904 {
905 case HollowShape.Square:
906 case HollowShape.Same:
907 break;
908
909 case HollowShape.Circle:
910
911 hollowVolume *= 0.78539816339f;
912 break;
913
914 case HollowShape.Triangle:
915
916 hollowVolume *= (0.5f * .5f);
917 break;
918
919 default:
920 hollowVolume = 0;
921 break;
922 }
923 volume *= (1.0f - hollowVolume);
924 }
925 }
926
927 else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
928 {
929 //a tube
930
931 volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
932 tmp= 1.0f -2.0e-2f * (float)(200 - _pbs.PathScaleY);
933 volume -= volume*tmp*tmp;
934
935 if (hollowAmount > 0.0)
936 {
937 hollowVolume *= hollowAmount;
938
939 switch (_pbs.HollowShape)
940 {
941 case HollowShape.Square:
942 case HollowShape.Same:
943 break;
944
945 case HollowShape.Circle:
946 hollowVolume *= 0.78539816339f;;
947 break;
948
949 case HollowShape.Triangle:
950 hollowVolume *= 0.5f * 0.5f;
951 break;
952 default:
953 hollowVolume = 0;
954 break;
955 }
956 volume *= (1.0f - hollowVolume);
957 }
958 }
959
960 break;
961
962 case ProfileShape.Circle:
963
964 if (_pbs.PathCurve == (byte)Extrusion.Straight)
965 {
966 volume *= 0.78539816339f; // elipse base
967
968 if (hollowAmount > 0.0)
969 {
970 switch (_pbs.HollowShape)
971 {
972 case HollowShape.Same:
973 case HollowShape.Circle:
974 break;
975
976 case HollowShape.Square:
977 hollowVolume *= 0.5f * 2.5984480504799f;
978 break;
979
980 case HollowShape.Triangle:
981 hollowVolume *= .5f * 1.27323954473516f;
982 break;
983
984 default:
985 hollowVolume = 0;
986 break;
987 }
988 volume *= (1.0f - hollowVolume);
989 }
990 }
991
992 else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
993 {
994 volume *= 0.61685027506808491367715568749226e-2f * (float)(200 - _pbs.PathScaleX);
995 tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
996 volume *= (1.0f - tmp * tmp);
997
998 if (hollowAmount > 0.0)
999 {
1000
1001 // calculate the hollow volume by it's shape compared to the prim shape
1002 hollowVolume *= hollowAmount;
1003
1004 switch (_pbs.HollowShape)
1005 {
1006 case HollowShape.Same:
1007 case HollowShape.Circle:
1008 break;
1009
1010 case HollowShape.Square:
1011 hollowVolume *= 0.5f * 2.5984480504799f;
1012 break;
1013
1014 case HollowShape.Triangle:
1015 hollowVolume *= .5f * 1.27323954473516f;
1016 break;
1017
1018 default:
1019 hollowVolume = 0;
1020 break;
1021 }
1022 volume *= (1.0f - hollowVolume);
1023 }
1024 }
1025 break;
1026
1027 case ProfileShape.HalfCircle:
1028 if (_pbs.PathCurve == (byte)Extrusion.Curve1)
1029 {
1030 volume *= 0.52359877559829887307710723054658f;
1031 }
1032 break;
1033
1034 case ProfileShape.EquilateralTriangle:
1035
1036 if (_pbs.PathCurve == (byte)Extrusion.Straight)
1037 {
1038 volume *= 0.32475953f;
1039
1040 if (hollowAmount > 0.0)
1041 {
1042
1043 // calculate the hollow volume by it's shape compared to the prim shape
1044 switch (_pbs.HollowShape)
1045 {
1046 case HollowShape.Same:
1047 case HollowShape.Triangle:
1048 hollowVolume *= .25f;
1049 break;
1050
1051 case HollowShape.Square:
1052 hollowVolume *= 0.499849f * 3.07920140172638f;
1053 break;
1054
1055 case HollowShape.Circle:
1056 // Hollow shape is a perfect cyllinder in respect to the cube's scale
1057 // Cyllinder hollow volume calculation
1058
1059 hollowVolume *= 0.1963495f * 3.07920140172638f;
1060 break;
1061
1062 default:
1063 hollowVolume = 0;
1064 break;
1065 }
1066 volume *= (1.0f - hollowVolume);
1067 }
1068 }
1069 else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
1070 {
1071 volume *= 0.32475953f;
1072 volume *= 0.01f * (float)(200 - _pbs.PathScaleX);
1073 tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
1074 volume *= (1.0f - tmp * tmp);
1075
1076 if (hollowAmount > 0.0)
1077 {
1078
1079 hollowVolume *= hollowAmount;
1080
1081 switch (_pbs.HollowShape)
1082 {
1083 case HollowShape.Same:
1084 case HollowShape.Triangle:
1085 hollowVolume *= .25f;
1086 break;
1087
1088 case HollowShape.Square:
1089 hollowVolume *= 0.499849f * 3.07920140172638f;
1090 break;
1091
1092 case HollowShape.Circle:
1093
1094 hollowVolume *= 0.1963495f * 3.07920140172638f;
1095 break;
1096
1097 default:
1098 hollowVolume = 0;
1099 break;
1100 }
1101 volume *= (1.0f - hollowVolume);
1102 }
1103 }
1104 break;
1105
1106 default:
1107 break;
1108 }
1109
1110
1111
1112 float taperX1;
1113 float taperY1;
1114 float taperX;
1115 float taperY;
1116 float pathBegin;
1117 float pathEnd;
1118 float profileBegin;
1119 float profileEnd;
1120
1121 if (_pbs.PathCurve == (byte)Extrusion.Straight || _pbs.PathCurve == (byte)Extrusion.Flexible)
1122 {
1123 taperX1 = _pbs.PathScaleX * 0.01f;
1124 if (taperX1 > 1.0f)
1125 taperX1 = 2.0f - taperX1;
1126 taperX = 1.0f - taperX1;
1127
1128 taperY1 = _pbs.PathScaleY * 0.01f;
1129 if (taperY1 > 1.0f)
1130 taperY1 = 2.0f - taperY1;
1131 taperY = 1.0f - taperY1;
1132 }
1133 else
1134 {
1135 taperX = _pbs.PathTaperX * 0.01f;
1136 if (taperX < 0.0f)
1137 taperX = -taperX;
1138 taperX1 = 1.0f - taperX;
1139
1140 taperY = _pbs.PathTaperY * 0.01f;
1141 if (taperY < 0.0f)
1142 taperY = -taperY;
1143 taperY1 = 1.0f - taperY;
1144
1145 }
1146
1147
1148 volume *= (taperX1 * taperY1 + 0.5f * (taperX1 * taperY + taperX * taperY1) + 0.3333333333f * taperX * taperY);
1149
1150 pathBegin = (float)_pbs.PathBegin * 2.0e-5f;
1151 pathEnd = 1.0f - (float)_pbs.PathEnd * 2.0e-5f;
1152 volume *= (pathEnd - pathBegin);
1153
1154// this is crude aproximation
1155 profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f;
1156 profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f;
1157 volume *= (profileEnd - profileBegin);
1158
1159 returnMass = m_density * volume;
1160
1161 if (returnMass <= 0)
1162 returnMass = 0.0001f;//ckrinke: Mass must be greater then zero.
1163// else if (returnMass > _parent_scene.maximumMassObject)
1164// returnMass = _parent_scene.maximumMassObject;
1165
1166
1167
1168
1169 // Recursively calculate mass
1170 bool HasChildPrim = false;
1171 lock (childrenPrim)
1172 {
1173 if (childrenPrim.Count > 0)
1174 {
1175 HasChildPrim = true;
1176 }
1177
1178 }
1179 if (HasChildPrim)
1180 {
1181 OdePrim[] childPrimArr = new OdePrim[0];
1182
1183 lock (childrenPrim)
1184 childPrimArr = childrenPrim.ToArray();
1185
1186 for (int i = 0; i < childPrimArr.Length; i++)
1187 {
1188 if (childPrimArr[i] != null && !childPrimArr[i].m_taintremove)
1189 returnMass += childPrimArr[i].CalculateMass();
1190 // failsafe, this shouldn't happen but with OpenSim, you never know :)
1191 if (i > 256)
1192 break;
1193 }
1194 }
1195 if (returnMass > _parent_scene.maximumMassObject)
1196 returnMass = _parent_scene.maximumMassObject;
1197 return returnMass;
1198 }// end CalculateMass
1199
1200 #endregion
1201
1202 public void setMass()
1203 {
1204 if (Body != (IntPtr) 0)
1205 {
1206 float newmass = CalculateMass();
1207
1208 //m_log.Info("[PHYSICS]: New Mass: " + newmass.ToString());
1209
1210 d.MassSetBoxTotal(out pMass, newmass, _size.X, _size.Y, _size.Z);
1211 d.BodySetMass(Body, ref pMass);
1212 }
1213 }
1214
1215 public void disableBody()
1216 {
1217 //this kills the body so things like 'mesh' can re-create it.
1218 lock (this)
1219 {
1220 if (!childPrim)
1221 {
1222 if (Body != IntPtr.Zero)
1223 {
1224 _parent_scene.remActivePrim(this);
1225 m_collisionCategories &= ~CollisionCategories.Body;
1226 m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
1227
1228 if (prim_geom != IntPtr.Zero)
1229 {
1230 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1231 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1232 }
1233
1234
1235 d.BodyDestroy(Body);
1236 lock (childrenPrim)
1237 {
1238 if (childrenPrim.Count > 0)
1239 {
1240 foreach (OdePrim prm in childrenPrim)
1241 {
1242 _parent_scene.remActivePrim(prm);
1243 prm.Body = IntPtr.Zero;
1244 }
1245 }
1246 }
1247 Body = IntPtr.Zero;
1248 }
1249 }
1250 else
1251 {
1252 _parent_scene.remActivePrim(this);
1253
1254 m_collisionCategories &= ~CollisionCategories.Body;
1255 m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
1256
1257 if (prim_geom != IntPtr.Zero)
1258 {
1259 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1260 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1261 }
1262
1263
1264 Body = IntPtr.Zero;
1265 }
1266 }
1267 m_disabled = true;
1268 m_collisionscore = 0;
1269 }
1270
1271 private static Dictionary<IMesh, IntPtr> m_MeshToTriMeshMap = new Dictionary<IMesh, IntPtr>();
1272
1273 public void setMesh(OdeScene parent_scene, IMesh mesh)
1274 {
1275 // This sleeper is there to moderate how long it takes between
1276 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
1277
1278 //Thread.Sleep(10);
1279
1280 //Kill Body so that mesh can re-make the geom
1281 if (IsPhysical && Body != IntPtr.Zero)
1282 {
1283 if (childPrim)
1284 {
1285 if (_parent != null)
1286 {
1287 OdePrim parent = (OdePrim)_parent;
1288 parent.ChildDelink(this);
1289 }
1290 }
1291 else
1292 {
1293 disableBody();
1294 }
1295 }
1296
1297 IntPtr vertices, indices;
1298 int vertexCount, indexCount;
1299 int vertexStride, triStride;
1300 mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap
1301 mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage
1302
1303 mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
1304 if (m_MeshToTriMeshMap.ContainsKey(mesh))
1305 {
1306 _triMeshData = m_MeshToTriMeshMap[mesh];
1307 }
1308 else
1309 {
1310 _triMeshData = d.GeomTriMeshDataCreate();
1311
1312 d.GeomTriMeshDataBuildSimple(_triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride);
1313 d.GeomTriMeshDataPreprocess(_triMeshData);
1314 m_MeshToTriMeshMap[mesh] = _triMeshData;
1315 }
1316
1317 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1318 try
1319 {
1320 // if (prim_geom == IntPtr.Zero) // setGeom takes care of phys engine recreate and prim_geom pointer
1321 // {
1322 SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
1323 // }
1324 }
1325 catch (AccessViolationException)
1326 {
1327 m_log.Error("[PHYSICS]: MESH LOCKED");
1328 return;
1329 }
1330
1331
1332 // if (IsPhysical && Body == (IntPtr) 0)
1333 // {
1334 // Recreate the body
1335 // m_interpenetrationcount = 0;
1336 // m_collisionscore = 0;
1337
1338 // enableBody();
1339 // }
1340 }
1341
1342 public void ProcessTaints(float timestep) //=============================================================================
1343 {
1344 if (m_taintadd)
1345 {
1346 changeadd(timestep);
1347 }
1348
1349 if (prim_geom != IntPtr.Zero)
1350 {
1351 if (!_position.ApproxEquals(m_taintposition, 0f))
1352 changemove(timestep);
1353
1354 if (m_taintrot != _orientation)
1355 {
1356 if(childPrim && IsPhysical) // For physical child prim...
1357 {
1358 rotate(timestep);
1359 // KF: ODE will also rotate the parent prim!
1360 // so rotate the root back to where it was
1361 OdePrim parent = (OdePrim)_parent;
1362 parent.rotate(timestep);
1363 }
1364 else
1365 {
1366 //Just rotate the prim
1367 rotate(timestep);
1368 }
1369 }
1370 //
1371
1372 if (m_taintPhysics != m_isphysical && !(m_taintparent != _parent))
1373 changePhysicsStatus(timestep);
1374 //
1375
1376 if (!_size.ApproxEquals(m_taintsize,0f))
1377 changesize(timestep);
1378 //
1379
1380 if (m_taintshape)
1381 changeshape(timestep);
1382 //
1383
1384 if (m_taintforce)
1385 changeAddForce(timestep);
1386
1387 if (m_taintaddangularforce)
1388 changeAddAngularForce(timestep);
1389
1390 if (!m_taintTorque.ApproxEquals(Vector3.Zero, 0.001f))
1391 changeSetTorque(timestep);
1392
1393 if (m_taintdisable)
1394 changedisable(timestep);
1395
1396 if (m_taintselected != m_isSelected)
1397 changeSelectedStatus(timestep);
1398
1399 if (!m_taintVelocity.ApproxEquals(Vector3.Zero, 0.001f))
1400 changevelocity(timestep);
1401
1402 if (m_taintparent != _parent)
1403 changelink(timestep);
1404
1405 if (m_taintCollidesWater != m_collidesWater)
1406 changefloatonwater(timestep);
1407/* obsolete
1408 if (!m_angularLock.ApproxEquals(m_taintAngularLock,0f))
1409 changeAngularLock(timestep);
1410 */
1411 }
1412 else
1413 {
1414 m_log.Error("[PHYSICS]: The scene reused a disposed PhysActor! *waves finger*, Don't be evil. A couple of things can cause this. An improper prim breakdown(be sure to set prim_geom to zero after d.GeomDestroy! An improper buildup (creating the geom failed). Or, the Scene Reused a physics actor after disposing it.)");
1415 }
1416 }
1417
1418/* obsolete
1419 private void changeAngularLock(float timestep)
1420 {
1421 if (_parent == null)
1422 {
1423 m_angularLock = m_taintAngularLock;
1424 m_angularLockSet = true;
1425 }
1426 }
1427 */
1428 private void changelink(float timestep)
1429 {
1430 // If the newly set parent is not null
1431 // create link
1432 if (_parent == null && m_taintparent != null)
1433 {
1434 if (m_taintparent.PhysicsActorType == (int)ActorTypes.Prim)
1435 {
1436 OdePrim obj = (OdePrim)m_taintparent;
1437 //obj.disableBody();
1438 obj.ParentPrim(this);
1439
1440 /*
1441 if (obj.Body != (IntPtr)0 && Body != (IntPtr)0 && obj.Body != Body)
1442 {
1443 _linkJointGroup = d.JointGroupCreate(0);
1444 m_linkJoint = d.JointCreateFixed(_parent_scene.world, _linkJointGroup);
1445 d.JointAttach(m_linkJoint, obj.Body, Body);
1446 d.JointSetFixed(m_linkJoint);
1447 }
1448 */
1449 }
1450 }
1451 // If the newly set parent is null
1452 // destroy link
1453 else if (_parent != null && m_taintparent == null)
1454 {
1455 if (_parent is OdePrim)
1456 {
1457 OdePrim obj = (OdePrim)_parent;
1458 obj.ChildDelink(this);
1459 childPrim = false;
1460 //_parent = null;
1461 }
1462
1463 /*
1464 if (Body != (IntPtr)0 && _linkJointGroup != (IntPtr)0)
1465 d.JointGroupDestroy(_linkJointGroup);
1466
1467 _linkJointGroup = (IntPtr)0;
1468 m_linkJoint = (IntPtr)0;
1469 */
1470 }
1471
1472 _parent = m_taintparent;
1473 m_taintPhysics = m_isphysical;
1474 }
1475
1476 // I'm the parent
1477 // prim is the child
1478 public void ParentPrim(OdePrim prim)
1479 {
1480 if (this.m_localID != prim.m_localID)
1481 {
1482 if (Body == IntPtr.Zero)
1483 {
1484 Body = d.BodyCreate(_parent_scene.world);
1485 setMass();
1486 }
1487 if (Body != IntPtr.Zero)
1488 {
1489 lock (childrenPrim)
1490 {
1491 if (!childrenPrim.Contains(prim))
1492 {
1493 childrenPrim.Add(prim);
1494
1495 foreach (OdePrim prm in childrenPrim)
1496 {
1497 d.Mass m2;
1498 d.MassSetZero(out m2);
1499 d.MassSetBoxTotal(out m2, prim.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
1500
1501
1502 d.Quaternion quat = new d.Quaternion();
1503 quat.W = prm._orientation.W;
1504 quat.X = prm._orientation.X;
1505 quat.Y = prm._orientation.Y;
1506 quat.Z = prm._orientation.Z;
1507
1508 d.Matrix3 mat = new d.Matrix3();
1509 d.RfromQ(out mat, ref quat);
1510 d.MassRotate(ref m2, ref mat);
1511 d.MassTranslate(ref m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z);
1512 d.MassAdd(ref pMass, ref m2);
1513 }
1514 foreach (OdePrim prm in childrenPrim)
1515 {
1516
1517 prm.m_collisionCategories |= CollisionCategories.Body;
1518 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
1519
1520 if (prm.prim_geom == IntPtr.Zero)
1521 {
1522 m_log.Warn("[PHYSICS]: Unable to link one of the linkset elements. No geom yet");
1523 continue;
1524 }
1525//Console.WriteLine(" GeomSetCategoryBits 1: " + prm.prim_geom + " - " + (int)prm.m_collisionCategories + " for " + m_primName);
1526 d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
1527 d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
1528
1529
1530 d.Quaternion quat = new d.Quaternion();
1531 quat.W = prm._orientation.W;
1532 quat.X = prm._orientation.X;
1533 quat.Y = prm._orientation.Y;
1534 quat.Z = prm._orientation.Z;
1535
1536 d.Matrix3 mat = new d.Matrix3();
1537 d.RfromQ(out mat, ref quat);
1538 if (Body != IntPtr.Zero)
1539 {
1540 d.GeomSetBody(prm.prim_geom, Body);
1541 prm.childPrim = true;
1542 d.GeomSetOffsetWorldPosition(prm.prim_geom, prm.Position.X , prm.Position.Y, prm.Position.Z);
1543 //d.GeomSetOffsetPosition(prim.prim_geom,
1544 // (Position.X - prm.Position.X) - pMass.c.X,
1545 // (Position.Y - prm.Position.Y) - pMass.c.Y,
1546 // (Position.Z - prm.Position.Z) - pMass.c.Z);
1547 d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat);
1548 //d.GeomSetOffsetRotation(prm.prim_geom, ref mat);
1549 d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
1550 d.BodySetMass(Body, ref pMass);
1551 }
1552 else
1553 {
1554 m_log.Debug("[PHYSICS]:I ain't got no boooooooooddy, no body");
1555 }
1556
1557
1558 prm.m_interpenetrationcount = 0;
1559 prm.m_collisionscore = 0;
1560 prm.m_disabled = false;
1561
1562 prm.Body = Body;
1563 _parent_scene.addActivePrim(prm);
1564 }
1565 m_collisionCategories |= CollisionCategories.Body;
1566 m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
1567
1568//Console.WriteLine("GeomSetCategoryBits 2: " + prim_geom + " - " + (int)m_collisionCategories + " for " + m_primName);
1569 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1570//Console.WriteLine(" Post GeomSetCategoryBits 2");
1571 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1572
1573
1574 d.Quaternion quat2 = new d.Quaternion();
1575 quat2.W = _orientation.W;
1576 quat2.X = _orientation.X;
1577 quat2.Y = _orientation.Y;
1578 quat2.Z = _orientation.Z;
1579
1580 d.Matrix3 mat2 = new d.Matrix3();
1581 d.RfromQ(out mat2, ref quat2);
1582 d.GeomSetBody(prim_geom, Body);
1583 d.GeomSetOffsetWorldPosition(prim_geom, Position.X - pMass.c.X, Position.Y - pMass.c.Y, Position.Z - pMass.c.Z);
1584 //d.GeomSetOffsetPosition(prim.prim_geom,
1585 // (Position.X - prm.Position.X) - pMass.c.X,
1586 // (Position.Y - prm.Position.Y) - pMass.c.Y,
1587 // (Position.Z - prm.Position.Z) - pMass.c.Z);
1588 //d.GeomSetOffsetRotation(prim_geom, ref mat2);
1589 d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
1590 d.BodySetMass(Body, ref pMass);
1591
1592 d.BodySetAutoDisableFlag(Body, true);
1593 d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
1594
1595
1596 m_interpenetrationcount = 0;
1597 m_collisionscore = 0;
1598 m_disabled = false;
1599
1600 d.BodySetPosition(Body, Position.X, Position.Y, Position.Z);
1601 if (m_type != Vehicle.TYPE_NONE) Enable(Body, _parent_scene);
1602 _parent_scene.addActivePrim(this);
1603 }
1604 }
1605 }
1606 }
1607
1608 }
1609
1610 private void ChildSetGeom(OdePrim odePrim)
1611 {
1612 //if (m_isphysical && Body != IntPtr.Zero)
1613 lock (childrenPrim)
1614 {
1615 foreach (OdePrim prm in childrenPrim)
1616 {
1617 //prm.childPrim = true;
1618 prm.disableBody();
1619 //prm.m_taintparent = null;
1620 //prm._parent = null;
1621 //prm.m_taintPhysics = false;
1622 //prm.m_disabled = true;
1623 //prm.childPrim = false;
1624 }
1625 }
1626 disableBody();
1627
1628
1629 if (Body != IntPtr.Zero)
1630 {
1631 _parent_scene.remActivePrim(this);
1632 }
1633
1634 lock (childrenPrim)
1635 {
1636 foreach (OdePrim prm in childrenPrim)
1637 {
1638 ParentPrim(prm);
1639 }
1640 }
1641
1642 }
1643
1644 private void ChildDelink(OdePrim odePrim)
1645 {
1646 // Okay, we have a delinked child.. need to rebuild the body.
1647 lock (childrenPrim)
1648 {
1649 foreach (OdePrim prm in childrenPrim)
1650 {
1651 prm.childPrim = true;
1652 prm.disableBody();
1653 //prm.m_taintparent = null;
1654 //prm._parent = null;
1655 //prm.m_taintPhysics = false;
1656 //prm.m_disabled = true;
1657 //prm.childPrim = false;
1658 }
1659 }
1660 disableBody();
1661
1662 lock (childrenPrim)
1663 {
1664 childrenPrim.Remove(odePrim);
1665 }
1666
1667 if (Body != IntPtr.Zero)
1668 {
1669 _parent_scene.remActivePrim(this);
1670 }
1671
1672 lock (childrenPrim)
1673 {
1674 foreach (OdePrim prm in childrenPrim)
1675 {
1676 ParentPrim(prm);
1677 }
1678 }
1679 }
1680
1681 private void changeSelectedStatus(float timestep)
1682 {
1683 if (m_taintselected)
1684 {
1685 m_collisionCategories = CollisionCategories.Selected;
1686 m_collisionFlags = (CollisionCategories.Sensor | CollisionCategories.Space);
1687
1688 // We do the body disable soft twice because 'in theory' a collision could have happened
1689 // in between the disabling and the collision properties setting
1690 // which would wake the physical body up from a soft disabling and potentially cause it to fall
1691 // through the ground.
1692
1693 // NOTE FOR JOINTS: this doesn't always work for jointed assemblies because if you select
1694 // just one part of the assembly, the rest of the assembly is non-selected and still simulating,
1695 // so that causes the selected part to wake up and continue moving.
1696
1697 // even if you select all parts of a jointed assembly, it is not guaranteed that the entire
1698 // assembly will stop simulating during the selection, because of the lack of atomicity
1699 // of select operations (their processing could be interrupted by a thread switch, causing
1700 // simulation to continue before all of the selected object notifications trickle down to
1701 // the physics engine).
1702
1703 // e.g. we select 100 prims that are connected by joints. non-atomically, the first 50 are
1704 // selected and disabled. then, due to a thread switch, the selection processing is
1705 // interrupted and the physics engine continues to simulate, so the last 50 items, whose
1706 // selection was not yet processed, continues to simulate. this wakes up ALL of the
1707 // first 50 again. then the last 50 are disabled. then the first 50, which were just woken
1708 // up, start simulating again, which in turn wakes up the last 50.
1709
1710 if (m_isphysical)
1711 {
1712 disableBodySoft();
1713 }
1714
1715 if (prim_geom != IntPtr.Zero)
1716 {
1717 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1718 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1719 }
1720
1721 if (m_isphysical)
1722 {
1723 disableBodySoft();
1724
1725 if (Body != IntPtr.Zero)
1726 {
1727 d.BodySetLinearVel(Body, 0f, 0f, 0f);
1728 d.BodySetForce(Body, 0, 0, 0);
1729 enableBodySoft();
1730 }
1731 }
1732 }
1733 else
1734 {
1735 m_collisionCategories = CollisionCategories.Geom;
1736
1737 if (m_isphysical)
1738 m_collisionCategories |= CollisionCategories.Body;
1739
1740 m_collisionFlags = m_default_collisionFlags;
1741
1742 if (m_collidesLand)
1743 m_collisionFlags |= CollisionCategories.Land;
1744 if (m_collidesWater)
1745 m_collisionFlags |= CollisionCategories.Water;
1746
1747 if (prim_geom != IntPtr.Zero)
1748 {
1749 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1750 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1751 }
1752/* Uhhh - stop the motion if the object is _selected_!!
1753 if (m_isphysical)
1754 {
1755 if (Body != IntPtr.Zero)
1756 {
1757 d.BodySetLinearVel(Body, 0f, 0f, 0f);
1758 d.BodySetForce(Body, 0, 0, 0);
1759 enableBodySoft();
1760 }
1761 }
1762*/
1763 }
1764
1765 resetCollisionAccounting();
1766 m_isSelected = m_taintselected;
1767 }//end changeSelectedStatus
1768
1769 public void ResetTaints()
1770 {
1771 m_taintposition = _position;
1772 m_taintrot = _orientation;
1773 m_taintPhysics = m_isphysical;
1774 m_taintselected = m_isSelected;
1775 m_taintsize = _size;
1776 m_taintshape = false;
1777 m_taintforce = false;
1778 m_taintdisable = false;
1779 m_taintVelocity = Vector3.Zero;
1780 }
1781
1782 public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
1783 {
1784//Console.WriteLine("CreateGeom:");
1785 if (_mesh != null) // Special - make mesh
1786 {
1787 setMesh(_parent_scene, _mesh);
1788 }
1789 else // not a mesh
1790 {
1791 if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1) // special profile??
1792 {
1793 if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z) // Equi-size
1794 {
1795 if (((_size.X / 2f) > 0f)) // Has size
1796 {
1797 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1798 try
1799 {
1800//Console.WriteLine(" CreateGeom 1");
1801 SetGeom(d.CreateSphere(m_targetSpace, _size.X / 2));
1802 }
1803 catch (AccessViolationException)
1804 {
1805 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1806 ode.dunlock(_parent_scene.world);
1807 return;
1808 }
1809 }
1810 else
1811 {
1812 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1813 try
1814 {
1815//Console.WriteLine(" CreateGeom 2");
1816 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
1817 }
1818 catch (AccessViolationException)
1819 {
1820 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1821 ode.dunlock(_parent_scene.world);
1822 return;
1823 }
1824 }
1825 }
1826 else // not equi-size
1827 {
1828 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1829 try
1830 {
1831//Console.WriteLine(" CreateGeom 3");
1832 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
1833 }
1834 catch (AccessViolationException)
1835 {
1836 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1837 ode.dunlock(_parent_scene.world);
1838 return;
1839 }
1840 }
1841 }
1842
1843 else // not special profile
1844 {
1845 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1846 try
1847 {
1848//Console.WriteLine(" CreateGeom 4");
1849 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
1850 }
1851 catch (AccessViolationException)
1852 {
1853 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1854 ode.dunlock(_parent_scene.world);
1855 return;
1856 }
1857 }
1858 }
1859 }
1860
1861 public void changeadd(float timestep)
1862 {
1863 int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
1864 IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position);
1865
1866 if (targetspace == IntPtr.Zero)
1867 targetspace = _parent_scene.createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
1868
1869 m_targetSpace = targetspace;
1870
1871 if (_mesh == null && m_meshfailed == false)
1872 {
1873 if (_parent_scene.needsMeshing(_pbs))
1874 {
1875 // Don't need to re-enable body.. it's done in SetMesh
1876 try
1877 {
1878 _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical);
1879 }
1880 catch
1881 {
1882 //Don't continuously try to mesh prims when meshing has failed
1883 m_meshfailed = true;
1884 }
1885 // createmesh returns null when it's a shape that isn't a cube.
1886 // m_log.Debug(m_localID);
1887 }
1888 }
1889
1890
1891 lock (_parent_scene.OdeLock)
1892 {
1893//Console.WriteLine("changeadd 1");
1894 CreateGeom(m_targetSpace, _mesh);
1895
1896 if (prim_geom != IntPtr.Zero)
1897 {
1898 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1899 d.Quaternion myrot = new d.Quaternion();
1900 myrot.X = _orientation.X;
1901 myrot.Y = _orientation.Y;
1902 myrot.Z = _orientation.Z;
1903 myrot.W = _orientation.W;
1904 d.GeomSetQuaternion(prim_geom, ref myrot);
1905 }
1906
1907 if (m_isphysical && Body == IntPtr.Zero)
1908 {
1909 enableBody();
1910 }
1911 }
1912
1913 changeSelectedStatus(timestep);
1914
1915 m_taintadd = false;
1916 }
1917
1918 public void changemove(float timestep)
1919 {
1920//Console.WriteLine("changemove sing/root {0} to {1}", m_primName, _position );
1921 if (m_isphysical)
1922 {
1923//Console.WriteLine("phys {0} {1} {2}", m_disabled, m_taintremove, childPrim);
1924// if (!m_disabled && !m_taintremove && !childPrim) After one edit m_disabled is sometimes set, disabling further edits!
1925 if (!m_taintremove && !childPrim)
1926 {
1927 if (Body == IntPtr.Zero)
1928 enableBody();
1929 //Prim auto disable after 20 frames,
1930 //if you move it, re-enable the prim manually.
1931 if (_parent != null)
1932 {
1933 if (m_linkJoint != IntPtr.Zero)
1934 {
1935 d.JointDestroy(m_linkJoint);
1936 m_linkJoint = IntPtr.Zero;
1937 }
1938 }
1939 if (Body != IntPtr.Zero)
1940 {
1941 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
1942
1943 if (_parent != null)
1944 {
1945 OdePrim odParent = (OdePrim)_parent;
1946 if (Body != (IntPtr)0 && odParent.Body != (IntPtr)0 && Body != odParent.Body)
1947 {
1948// KF: Fixed Joints were removed? Anyway - this Console.WriteLine does not show up, so routine is not used??
1949Console.WriteLine(" JointCreateFixed");
1950 m_linkJoint = d.JointCreateFixed(_parent_scene.world, _linkJointGroup);
1951 d.JointAttach(m_linkJoint, Body, odParent.Body);
1952 d.JointSetFixed(m_linkJoint);
1953 }
1954 }
1955 d.BodyEnable(Body);
1956 if (m_type != Vehicle.TYPE_NONE)
1957 {
1958 Enable(Body, _parent_scene);
1959 }
1960 }
1961 else
1962 {
1963 m_log.Warn("[PHYSICS]: Body Still null after enableBody(). This is a crash scenario.");
1964 }
1965 }
1966 //else
1967 // {
1968 //m_log.Debug("[BUG]: race!");
1969 //}
1970 }
1971 else
1972 {
1973 // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
1974 // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
1975 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1976
1977 IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
1978 m_targetSpace = tempspace;
1979
1980 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1981 if (prim_geom != IntPtr.Zero)
1982 {
1983 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1984
1985 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1986 d.SpaceAdd(m_targetSpace, prim_geom);
1987 }
1988 }
1989
1990 changeSelectedStatus(timestep);
1991
1992 resetCollisionAccounting();
1993 m_taintposition = _position;
1994 }
1995
1996
1997
1998 public void rotate(float timestep)
1999 {
2000 d.Quaternion myrot = new d.Quaternion();
2001 myrot.X = _orientation.X;
2002 myrot.Y = _orientation.Y;
2003 myrot.Z = _orientation.Z;
2004 myrot.W = _orientation.W;
2005 if (Body != IntPtr.Zero)
2006 {
2007 // KF: If this is a root prim do BodySet
2008 d.BodySetQuaternion(Body, ref myrot);
2009 }
2010 else
2011 {
2012 // daughter prim, do Geom set
2013 d.GeomSetQuaternion(prim_geom, ref myrot);
2014 }
2015
2016 resetCollisionAccounting();
2017 m_taintrot = _orientation;
2018 }
2019
2020 private void resetCollisionAccounting()
2021 {
2022 m_collisionscore = 0;
2023 m_interpenetrationcount = 0;
2024 m_disabled = false;
2025 }
2026
2027 public void changedisable(float timestep)
2028 {
2029 m_disabled = true;
2030 if (Body != IntPtr.Zero)
2031 {
2032 d.BodyDisable(Body);
2033 Body = IntPtr.Zero;
2034 }
2035
2036 m_taintdisable = false;
2037 }
2038
2039 public void changePhysicsStatus(float timestep)
2040 {
2041 if (m_isphysical == true)
2042 {
2043 if (Body == IntPtr.Zero)
2044 {
2045 if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
2046 {
2047 changeshape(2f);
2048 }
2049 else
2050 {
2051 enableBody();
2052 }
2053 }
2054 }
2055 else
2056 {
2057 if (Body != IntPtr.Zero)
2058 {
2059 if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
2060 {
2061 _mesh = null;
2062//Console.WriteLine("changePhysicsStatus for " + m_primName );
2063 changeadd(2f);
2064 }
2065 if (childPrim)
2066 {
2067 if (_parent != null)
2068 {
2069 OdePrim parent = (OdePrim)_parent;
2070 parent.ChildDelink(this);
2071 }
2072 }
2073 else
2074 {
2075 disableBody();
2076 }
2077 }
2078 }
2079
2080 changeSelectedStatus(timestep);
2081
2082 resetCollisionAccounting();
2083 m_taintPhysics = m_isphysical;
2084 }
2085
2086 public void changesize(float timestamp)
2087 {
2088
2089 string oldname = _parent_scene.geom_name_map[prim_geom];
2090
2091 if (_size.X <= 0) _size.X = 0.01f;
2092 if (_size.Y <= 0) _size.Y = 0.01f;
2093 if (_size.Z <= 0) _size.Z = 0.01f;
2094
2095 // Cleanup of old prim geometry
2096 if (_mesh != null)
2097 {
2098 // Cleanup meshing here
2099 }
2100 //kill body to rebuild
2101 if (IsPhysical && Body != IntPtr.Zero)
2102 {
2103 if (childPrim)
2104 {
2105 if (_parent != null)
2106 {
2107 OdePrim parent = (OdePrim)_parent;
2108 parent.ChildDelink(this);
2109 }
2110 }
2111 else
2112 {
2113 disableBody();
2114 }
2115 }
2116 if (d.SpaceQuery(m_targetSpace, prim_geom))
2117 {
2118 _parent_scene.waitForSpaceUnlock(m_targetSpace);
2119 d.SpaceRemove(m_targetSpace, prim_geom);
2120 }
2121 // we don't need to do space calculation because the client sends a position update also.
2122
2123 // Construction of new prim
2124 if (_parent_scene.needsMeshing(_pbs) && m_meshfailed == false)
2125 {
2126 float meshlod = _parent_scene.meshSculptLOD;
2127
2128 if (IsPhysical)
2129 meshlod = _parent_scene.MeshSculptphysicalLOD;
2130 // Don't need to re-enable body.. it's done in SetMesh
2131
2132 IMesh mesh = null;
2133
2134 try
2135 {
2136 if (_parent_scene.needsMeshing(_pbs))
2137 mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2138 }
2139 catch
2140 {
2141 m_meshfailed = true;
2142 }
2143
2144 //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2145//Console.WriteLine("changesize 1");
2146 CreateGeom(m_targetSpace, mesh);
2147
2148
2149 }
2150 else
2151 {
2152 _mesh = null;
2153//Console.WriteLine("changesize 2");
2154 CreateGeom(m_targetSpace, _mesh);
2155 }
2156
2157 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
2158 d.Quaternion myrot = new d.Quaternion();
2159 myrot.X = _orientation.X;
2160 myrot.Y = _orientation.Y;
2161 myrot.Z = _orientation.Z;
2162 myrot.W = _orientation.W;
2163 d.GeomSetQuaternion(prim_geom, ref myrot);
2164
2165 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
2166 if (IsPhysical && Body == IntPtr.Zero && !childPrim)
2167 {
2168 // Re creates body on size.
2169 // EnableBody also does setMass()
2170 enableBody();
2171 d.BodyEnable(Body);
2172 }
2173
2174 _parent_scene.geom_name_map[prim_geom] = oldname;
2175
2176 changeSelectedStatus(timestamp);
2177 if (childPrim)
2178 {
2179 if (_parent is OdePrim)
2180 {
2181 OdePrim parent = (OdePrim)_parent;
2182 parent.ChildSetGeom(this);
2183 }
2184 }
2185 resetCollisionAccounting();
2186 m_taintsize = _size;
2187 }
2188
2189
2190
2191 public void changefloatonwater(float timestep)
2192 {
2193 m_collidesWater = m_taintCollidesWater;
2194
2195 if (prim_geom != IntPtr.Zero)
2196 {
2197 if (m_collidesWater)
2198 {
2199 m_collisionFlags |= CollisionCategories.Water;
2200 }
2201 else
2202 {
2203 m_collisionFlags &= ~CollisionCategories.Water;
2204 }
2205 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
2206 }
2207 }
2208
2209 public void changeshape(float timestamp)
2210 {
2211 string oldname = _parent_scene.geom_name_map[prim_geom];
2212
2213 // Cleanup of old prim geometry and Bodies
2214 if (IsPhysical && Body != IntPtr.Zero)
2215 {
2216 if (childPrim)
2217 {
2218 if (_parent != null)
2219 {
2220 OdePrim parent = (OdePrim)_parent;
2221 parent.ChildDelink(this);
2222 }
2223 }
2224 else
2225 {
2226 disableBody();
2227 }
2228 }
2229
2230
2231 // we don't need to do space calculation because the client sends a position update also.
2232 if (_size.X <= 0) _size.X = 0.01f;
2233 if (_size.Y <= 0) _size.Y = 0.01f;
2234 if (_size.Z <= 0) _size.Z = 0.01f;
2235 // Construction of new prim
2236
2237 if (_parent_scene.needsMeshing(_pbs) && m_meshfailed == false)
2238 {
2239 // Don't need to re-enable body.. it's done in SetMesh
2240 float meshlod = _parent_scene.meshSculptLOD;
2241
2242 if (IsPhysical)
2243 meshlod = _parent_scene.MeshSculptphysicalLOD;
2244 try
2245 {
2246 IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2247 CreateGeom(m_targetSpace, mesh);
2248 }
2249 catch
2250 {
2251 m_meshfailed = true;
2252 }
2253 // createmesh returns null when it doesn't mesh.
2254 }
2255 else
2256 {
2257 _mesh = null;
2258//Console.WriteLine("changeshape");
2259 CreateGeom(m_targetSpace, null);
2260 }
2261
2262 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
2263 d.Quaternion myrot = new d.Quaternion();
2264 //myrot.W = _orientation.w;
2265 myrot.W = _orientation.W;
2266 myrot.X = _orientation.X;
2267 myrot.Y = _orientation.Y;
2268 myrot.Z = _orientation.Z;
2269 d.GeomSetQuaternion(prim_geom, ref myrot);
2270
2271 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
2272 if (IsPhysical && Body == IntPtr.Zero)
2273 {
2274 // Re creates body on size.
2275 // EnableBody also does setMass()
2276 enableBody();
2277 if (Body != IntPtr.Zero)
2278 {
2279 d.BodyEnable(Body);
2280 }
2281 }
2282 _parent_scene.geom_name_map[prim_geom] = oldname;
2283
2284 changeSelectedStatus(timestamp);
2285 if (childPrim)
2286 {
2287 if (_parent is OdePrim)
2288 {
2289 OdePrim parent = (OdePrim)_parent;
2290 parent.ChildSetGeom(this);
2291 }
2292 }
2293 resetCollisionAccounting();
2294 m_taintshape = false;
2295 }
2296
2297 public void changeAddForce(float timestamp)
2298 {
2299 if (!m_isSelected)
2300 {
2301 lock (m_forcelist)
2302 {
2303 //m_log.Info("[PHYSICS]: dequeing forcelist");
2304 if (IsPhysical)
2305 {
2306 Vector3 iforce = Vector3.Zero;
2307 int i = 0;
2308 try
2309 {
2310 for (i = 0; i < m_forcelist.Count; i++)
2311 {
2312
2313 iforce = iforce + (m_forcelist[i] * 100);
2314 }
2315 }
2316 catch (IndexOutOfRangeException)
2317 {
2318 m_forcelist = new List<Vector3>();
2319 m_collisionscore = 0;
2320 m_interpenetrationcount = 0;
2321 m_taintforce = false;
2322 return;
2323 }
2324 catch (ArgumentOutOfRangeException)
2325 {
2326 m_forcelist = new List<Vector3>();
2327 m_collisionscore = 0;
2328 m_interpenetrationcount = 0;
2329 m_taintforce = false;
2330 return;
2331 }
2332 d.BodyEnable(Body);
2333 d.BodyAddForce(Body, iforce.X, iforce.Y, iforce.Z);
2334 }
2335 m_forcelist.Clear();
2336 }
2337
2338 m_collisionscore = 0;
2339 m_interpenetrationcount = 0;
2340 }
2341
2342 m_taintforce = false;
2343
2344 }
2345
2346
2347
2348 public void changeSetTorque(float timestamp)
2349 {
2350 if (!m_isSelected)
2351 {
2352 if (IsPhysical && Body != IntPtr.Zero)
2353 {
2354 d.BodySetTorque(Body, m_taintTorque.X, m_taintTorque.Y, m_taintTorque.Z);
2355 }
2356 }
2357
2358 m_taintTorque = Vector3.Zero;
2359 }
2360
2361 public void changeAddAngularForce(float timestamp)
2362 {
2363 if (!m_isSelected)
2364 {
2365 lock (m_angularforcelist)
2366 {
2367 //m_log.Info("[PHYSICS]: dequeing forcelist");
2368 if (IsPhysical)
2369 {
2370 Vector3 iforce = Vector3.Zero;
2371 for (int i = 0; i < m_angularforcelist.Count; i++)
2372 {
2373 iforce = iforce + (m_angularforcelist[i] * 100);
2374 }
2375 d.BodyEnable(Body);
2376 d.BodyAddTorque(Body, iforce.X, iforce.Y, iforce.Z);
2377
2378 }
2379 m_angularforcelist.Clear();
2380 }
2381
2382 m_collisionscore = 0;
2383 m_interpenetrationcount = 0;
2384 }
2385
2386 m_taintaddangularforce = false;
2387 }
2388
2389 private void changevelocity(float timestep)
2390 {
2391 if (!m_isSelected)
2392 {
2393 Thread.Sleep(20);
2394 if (IsPhysical)
2395 {
2396 if (Body != IntPtr.Zero)
2397 d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z);
2398 }
2399
2400 //resetCollisionAccounting();
2401 }
2402 m_taintVelocity = Vector3.Zero;
2403 }
2404
2405 public void UpdatePositionAndVelocity()
2406 {
2407 return; // moved to the Move () method
2408 }
2409
2410 public d.Mass FromMatrix4(Matrix4 pMat, ref d.Mass obj)
2411 {
2412 obj.I.M00 = pMat[0, 0];
2413 obj.I.M01 = pMat[0, 1];
2414 obj.I.M02 = pMat[0, 2];
2415 obj.I.M10 = pMat[1, 0];
2416 obj.I.M11 = pMat[1, 1];
2417 obj.I.M12 = pMat[1, 2];
2418 obj.I.M20 = pMat[2, 0];
2419 obj.I.M21 = pMat[2, 1];
2420 obj.I.M22 = pMat[2, 2];
2421 return obj;
2422 }
2423
2424 public override void SubscribeEvents(int ms)
2425 {
2426 m_eventsubscription = ms;
2427 _parent_scene.addCollisionEventReporting(this);
2428 }
2429
2430 public override void UnSubscribeEvents()
2431 {
2432 _parent_scene.remCollisionEventReporting(this);
2433 m_eventsubscription = 0;
2434 }
2435
2436 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
2437 {
2438 if (CollisionEventsThisFrame == null)
2439 CollisionEventsThisFrame = new CollisionEventUpdate();
2440 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
2441 }
2442
2443 public void SendCollisions()
2444 {
2445 if (CollisionEventsThisFrame == null)
2446 return;
2447
2448 base.SendCollisionUpdate(CollisionEventsThisFrame);
2449
2450 if (CollisionEventsThisFrame.m_objCollisionList.Count == 0)
2451 CollisionEventsThisFrame = null;
2452 else
2453 CollisionEventsThisFrame = new CollisionEventUpdate();
2454 }
2455
2456 public override bool SubscribedEvents()
2457 {
2458 if (m_eventsubscription > 0)
2459 return true;
2460 return false;
2461 }
2462
2463 public static Matrix4 Inverse(Matrix4 pMat)
2464 {
2465 if (determinant3x3(pMat) == 0)
2466 {
2467 return Matrix4.Identity; // should probably throw an error. singluar matrix inverse not possible
2468 }
2469
2470
2471
2472 return (Adjoint(pMat) / determinant3x3(pMat));
2473 }
2474
2475 public static Matrix4 Adjoint(Matrix4 pMat)
2476 {
2477 Matrix4 adjointMatrix = new Matrix4();
2478 for (int i=0; i<4; i++)
2479 {
2480 for (int j=0; j<4; j++)
2481 {
2482 Matrix4SetValue(ref adjointMatrix, i, j, (float)(Math.Pow(-1, i + j) * (determinant3x3(Minor(pMat, i, j)))));
2483 }
2484 }
2485
2486 adjointMatrix = Transpose(adjointMatrix);
2487 return adjointMatrix;
2488 }
2489
2490 public static Matrix4 Minor(Matrix4 matrix, int iRow, int iCol)
2491 {
2492 Matrix4 minor = new Matrix4();
2493 int m = 0, n = 0;
2494 for (int i = 0; i < 4; i++)
2495 {
2496 if (i == iRow)
2497 continue;
2498 n = 0;
2499 for (int j = 0; j < 4; j++)
2500 {
2501 if (j == iCol)
2502 continue;
2503 Matrix4SetValue(ref minor, m,n, matrix[i, j]);
2504 n++;
2505 }
2506 m++;
2507 }
2508 return minor;
2509 }
2510
2511 public static Matrix4 Transpose(Matrix4 pMat)
2512 {
2513 Matrix4 transposeMatrix = new Matrix4();
2514 for (int i = 0; i < 4; i++)
2515 for (int j = 0; j < 4; j++)
2516 Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]);
2517 return transposeMatrix;
2518 }
2519
2520 public static void Matrix4SetValue(ref Matrix4 pMat, int r, int c, float val)
2521 {
2522 switch (r)
2523 {
2524 case 0:
2525 switch (c)
2526 {
2527 case 0:
2528 pMat.M11 = val;
2529 break;
2530 case 1:
2531 pMat.M12 = val;
2532 break;
2533 case 2:
2534 pMat.M13 = val;
2535 break;
2536 case 3:
2537 pMat.M14 = val;
2538 break;
2539 }
2540
2541 break;
2542 case 1:
2543 switch (c)
2544 {
2545 case 0:
2546 pMat.M21 = val;
2547 break;
2548 case 1:
2549 pMat.M22 = val;
2550 break;
2551 case 2:
2552 pMat.M23 = val;
2553 break;
2554 case 3:
2555 pMat.M24 = val;
2556 break;
2557 }
2558
2559 break;
2560 case 2:
2561 switch (c)
2562 {
2563 case 0:
2564 pMat.M31 = val;
2565 break;
2566 case 1:
2567 pMat.M32 = val;
2568 break;
2569 case 2:
2570 pMat.M33 = val;
2571 break;
2572 case 3:
2573 pMat.M34 = val;
2574 break;
2575 }
2576
2577 break;
2578 case 3:
2579 switch (c)
2580 {
2581 case 0:
2582 pMat.M41 = val;
2583 break;
2584 case 1:
2585 pMat.M42 = val;
2586 break;
2587 case 2:
2588 pMat.M43 = val;
2589 break;
2590 case 3:
2591 pMat.M44 = val;
2592 break;
2593 }
2594
2595 break;
2596 }
2597 }
2598 private static float determinant3x3(Matrix4 pMat)
2599 {
2600 float det = 0;
2601 float diag1 = pMat[0, 0]*pMat[1, 1]*pMat[2, 2];
2602 float diag2 = pMat[0, 1]*pMat[2, 1]*pMat[2, 0];
2603 float diag3 = pMat[0, 2]*pMat[1, 0]*pMat[2, 1];
2604 float diag4 = pMat[2, 0]*pMat[1, 1]*pMat[0, 2];
2605 float diag5 = pMat[2, 1]*pMat[1, 2]*pMat[0, 0];
2606 float diag6 = pMat[2, 2]*pMat[1, 0]*pMat[0, 1];
2607
2608 det = diag1 + diag2 + diag3 - (diag4 + diag5 + diag6);
2609 return det;
2610
2611 }
2612
2613 private static void DMassCopy(ref d.Mass src, ref d.Mass dst)
2614 {
2615 dst.c.W = src.c.W;
2616 dst.c.X = src.c.X;
2617 dst.c.Y = src.c.Y;
2618 dst.c.Z = src.c.Z;
2619 dst.mass = src.mass;
2620 dst.I.M00 = src.I.M00;
2621 dst.I.M01 = src.I.M01;
2622 dst.I.M02 = src.I.M02;
2623 dst.I.M10 = src.I.M10;
2624 dst.I.M11 = src.I.M11;
2625 dst.I.M12 = src.I.M12;
2626 dst.I.M20 = src.I.M20;
2627 dst.I.M21 = src.I.M21;
2628 dst.I.M22 = src.I.M22;
2629 }
2630
2631 public override void SetMaterial(int pMaterial)
2632 {
2633 m_material = pMaterial;
2634 }
2635
2636 internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
2637 {
2638 switch (pParam)
2639 {
2640 case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
2641 if (pValue < 0.01f) pValue = 0.01f;
2642 // m_angularDeflectionEfficiency = pValue;
2643 break;
2644 case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
2645 if (pValue < 0.1f) pValue = 0.1f;
2646 // m_angularDeflectionTimescale = pValue;
2647 break;
2648 case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
2649 if (pValue < 0.3f) pValue = 0.3f;
2650 m_angularMotorDecayTimescale = pValue;
2651 break;
2652 case Vehicle.ANGULAR_MOTOR_TIMESCALE:
2653 if (pValue < 0.3f) pValue = 0.3f;
2654 m_angularMotorTimescale = pValue;
2655 break;
2656 case Vehicle.BANKING_EFFICIENCY:
2657 if (pValue < 0.01f) pValue = 0.01f;
2658 // m_bankingEfficiency = pValue;
2659 break;
2660 case Vehicle.BANKING_MIX:
2661 if (pValue < 0.01f) pValue = 0.01f;
2662 // m_bankingMix = pValue;
2663 break;
2664 case Vehicle.BANKING_TIMESCALE:
2665 if (pValue < 0.01f) pValue = 0.01f;
2666 // m_bankingTimescale = pValue;
2667 break;
2668 case Vehicle.BUOYANCY:
2669 if (pValue < -1f) pValue = -1f;
2670 if (pValue > 1f) pValue = 1f;
2671 m_VehicleBuoyancy = pValue;
2672 break;
2673// case Vehicle.HOVER_EFFICIENCY:
2674// if (pValue < 0f) pValue = 0f;
2675// if (pValue > 1f) pValue = 1f;
2676// m_VhoverEfficiency = pValue;
2677// break;
2678 case Vehicle.HOVER_HEIGHT:
2679 m_VhoverHeight = pValue;
2680 break;
2681 case Vehicle.HOVER_TIMESCALE:
2682 if (pValue < 0.1f) pValue = 0.1f;
2683 m_VhoverTimescale = pValue;
2684 break;
2685 case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
2686 if (pValue < 0.01f) pValue = 0.01f;
2687 // m_linearDeflectionEfficiency = pValue;
2688 break;
2689 case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
2690 if (pValue < 0.01f) pValue = 0.01f;
2691 // m_linearDeflectionTimescale = pValue;
2692 break;
2693 case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
2694 if (pValue < 0.3f) pValue = 0.3f;
2695 m_linearMotorDecayTimescale = pValue;
2696 break;
2697 case Vehicle.LINEAR_MOTOR_TIMESCALE:
2698 if (pValue < 0.1f) pValue = 0.1f;
2699 m_linearMotorTimescale = pValue;
2700 break;
2701 case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
2702 if (pValue < 0.1f) pValue = 0.1f; // Less goes unstable
2703 if (pValue > 1.0f) pValue = 1.0f;
2704 m_verticalAttractionEfficiency = pValue;
2705 break;
2706 case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
2707 if (pValue < 0.1f) pValue = 0.1f;
2708 m_verticalAttractionTimescale = pValue;
2709 break;
2710
2711 // These are vector properties but the engine lets you use a single float value to
2712 // set all of the components to the same value
2713 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
2714 if (pValue > 30f) pValue = 30f;
2715 if (pValue < 0.1f) pValue = 0.1f;
2716 m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
2717 break;
2718 case Vehicle.ANGULAR_MOTOR_DIRECTION:
2719 m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
2720 UpdateAngDecay();
2721 break;
2722 case Vehicle.LINEAR_FRICTION_TIMESCALE:
2723 if (pValue < 0.1f) pValue = 0.1f;
2724 m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
2725 break;
2726 case Vehicle.LINEAR_MOTOR_DIRECTION:
2727 m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
2728 UpdateLinDecay();
2729 break;
2730 case Vehicle.LINEAR_MOTOR_OFFSET:
2731 // m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
2732 break;
2733
2734 }
2735
2736 }//end ProcessFloatVehicleParam
2737
2738 internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
2739 {
2740 switch (pParam)
2741 {
2742 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
2743 if (pValue.X > 30f) pValue.X = 30f;
2744 if (pValue.X < 0.1f) pValue.X = 0.1f;
2745 if (pValue.Y > 30f) pValue.Y = 30f;
2746 if (pValue.Y < 0.1f) pValue.Y = 0.1f;
2747 if (pValue.Z > 30f) pValue.Z = 30f;
2748 if (pValue.Z < 0.1f) pValue.Z = 0.1f;
2749 m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
2750 break;
2751 case Vehicle.ANGULAR_MOTOR_DIRECTION:
2752 m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
2753 // Limit requested angular speed to 2 rps= 4 pi rads/sec
2754 if(m_angularMotorDirection.X > 12.56f) m_angularMotorDirection.X = 12.56f;
2755 if(m_angularMotorDirection.X < - 12.56f) m_angularMotorDirection.X = - 12.56f;
2756 if(m_angularMotorDirection.Y > 12.56f) m_angularMotorDirection.Y = 12.56f;
2757 if(m_angularMotorDirection.Y < - 12.56f) m_angularMotorDirection.Y = - 12.56f;
2758 if(m_angularMotorDirection.Z > 12.56f) m_angularMotorDirection.Z = 12.56f;
2759 if(m_angularMotorDirection.Z < - 12.56f) m_angularMotorDirection.Z = - 12.56f;
2760 UpdateAngDecay();
2761 break;
2762 case Vehicle.LINEAR_FRICTION_TIMESCALE:
2763 if (pValue.X < 0.1f) pValue.X = 0.1f;
2764 if (pValue.Y < 0.1f) pValue.Y = 0.1f;
2765 if (pValue.Z < 0.1f) pValue.Z = 0.1f;
2766 m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
2767 break;
2768 case Vehicle.LINEAR_MOTOR_DIRECTION:
2769 m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); // velocity requested by LSL, for max limiting
2770 UpdateLinDecay();
2771 break;
2772 case Vehicle.LINEAR_MOTOR_OFFSET:
2773 // m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
2774 break;
2775 }
2776
2777 }//end ProcessVectorVehicleParam
2778
2779 internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
2780 {
2781 switch (pParam)
2782 {
2783 case Vehicle.REFERENCE_FRAME:
2784 // m_referenceFrame = pValue;
2785 break;
2786 }
2787
2788 }//end ProcessRotationVehicleParam
2789
2790 internal void ProcessVehicleFlags(int pParam, bool remove)
2791 {
2792 if (remove)
2793 {
2794 m_flags &= ~((VehicleFlag)pParam);
2795 }
2796 else
2797 {
2798 m_flags |= (VehicleFlag)pParam;
2799 }
2800 }
2801
2802 internal void ProcessTypeChange(Vehicle pType)
2803 {
2804 // Set Defaults For Type
2805 m_type = pType;
2806 switch (pType)
2807 {
2808 case Vehicle.TYPE_SLED:
2809 m_linearFrictionTimescale = new Vector3(30, 1, 1000);
2810 m_angularFrictionTimescale = new Vector3(30, 30, 30);
2811// m_lLinMotorVel = Vector3.Zero;
2812 m_linearMotorTimescale = 1000;
2813 m_linearMotorDecayTimescale = 120;
2814 m_angularMotorDirection = Vector3.Zero;
2815 m_angularMotorDVel = Vector3.Zero;
2816 m_angularMotorTimescale = 1000;
2817 m_angularMotorDecayTimescale = 120;
2818 m_VhoverHeight = 0;
2819// m_VhoverEfficiency = 1;
2820 m_VhoverTimescale = 10;
2821 m_VehicleBuoyancy = 0;
2822 // m_linearDeflectionEfficiency = 1;
2823 // m_linearDeflectionTimescale = 1;
2824 // m_angularDeflectionEfficiency = 1;
2825 // m_angularDeflectionTimescale = 1000;
2826 // m_bankingEfficiency = 0;
2827 // m_bankingMix = 1;
2828 // m_bankingTimescale = 10;
2829 // m_referenceFrame = Quaternion.Identity;
2830 m_flags &=
2831 ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
2832 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
2833 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
2834 break;
2835 case Vehicle.TYPE_CAR:
2836 m_linearFrictionTimescale = new Vector3(100, 2, 1000);
2837 m_angularFrictionTimescale = new Vector3(30, 30, 30); // was 1000, but sl max frict time is 30.
2838// m_lLinMotorVel = Vector3.Zero;
2839 m_linearMotorTimescale = 1;
2840 m_linearMotorDecayTimescale = 60;
2841 m_angularMotorDirection = Vector3.Zero;
2842 m_angularMotorDVel = Vector3.Zero;
2843 m_angularMotorTimescale = 1;
2844 m_angularMotorDecayTimescale = 0.8f;
2845 m_VhoverHeight = 0;
2846// m_VhoverEfficiency = 0;
2847 m_VhoverTimescale = 1000;
2848 m_VehicleBuoyancy = 0;
2849 // // m_linearDeflectionEfficiency = 1;
2850 // // m_linearDeflectionTimescale = 2;
2851 // // m_angularDeflectionEfficiency = 0;
2852 // m_angularDeflectionTimescale = 10;
2853 m_verticalAttractionEfficiency = 1f;
2854 m_verticalAttractionTimescale = 10f;
2855 // m_bankingEfficiency = -0.2f;
2856 // m_bankingMix = 1;
2857 // m_bankingTimescale = 1;
2858 // m_referenceFrame = Quaternion.Identity;
2859 m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
2860 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_UP_ONLY |
2861 VehicleFlag.LIMIT_MOTOR_UP);
2862 break;
2863 case Vehicle.TYPE_BOAT:
2864 m_linearFrictionTimescale = new Vector3(10, 3, 2);
2865 m_angularFrictionTimescale = new Vector3(10,10,10);
2866// m_lLinMotorVel = Vector3.Zero;
2867 m_linearMotorTimescale = 5;
2868 m_linearMotorDecayTimescale = 60;
2869 m_angularMotorDirection = Vector3.Zero;
2870 m_angularMotorDVel = Vector3.Zero;
2871 m_angularMotorTimescale = 4;
2872 m_angularMotorDecayTimescale = 4;
2873 m_VhoverHeight = 0;
2874// m_VhoverEfficiency = 0.5f;
2875 m_VhoverTimescale = 2;
2876 m_VehicleBuoyancy = 1;
2877 // m_linearDeflectionEfficiency = 0.5f;
2878 // m_linearDeflectionTimescale = 3;
2879 // m_angularDeflectionEfficiency = 0.5f;
2880 // m_angularDeflectionTimescale = 5;
2881 m_verticalAttractionEfficiency = 0.5f;
2882 m_verticalAttractionTimescale = 5f;
2883 // m_bankingEfficiency = -0.3f;
2884 // m_bankingMix = 0.8f;
2885 // m_bankingTimescale = 1;
2886 // m_referenceFrame = Quaternion.Identity;
2887 m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY |
2888 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
2889 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY |
2890 VehicleFlag.LIMIT_MOTOR_UP);
2891 break;
2892 case Vehicle.TYPE_AIRPLANE:
2893 m_linearFrictionTimescale = new Vector3(200, 10, 5);
2894 m_angularFrictionTimescale = new Vector3(20, 20, 20);
2895// m_lLinMotorVel = Vector3.Zero;
2896 m_linearMotorTimescale = 2;
2897 m_linearMotorDecayTimescale = 60;
2898 m_angularMotorDirection = Vector3.Zero;
2899 m_angularMotorDVel = Vector3.Zero;
2900 m_angularMotorTimescale = 4;
2901 m_angularMotorDecayTimescale = 4;
2902 m_VhoverHeight = 0;
2903// m_VhoverEfficiency = 0.5f;
2904 m_VhoverTimescale = 1000;
2905 m_VehicleBuoyancy = 0;
2906 // m_linearDeflectionEfficiency = 0.5f;
2907 // m_linearDeflectionTimescale = 3;
2908 // m_angularDeflectionEfficiency = 1;
2909 // m_angularDeflectionTimescale = 2;
2910 m_verticalAttractionEfficiency = 0.9f;
2911 m_verticalAttractionTimescale = 2f;
2912 // m_bankingEfficiency = 1;
2913 // m_bankingMix = 0.7f;
2914 // m_bankingTimescale = 2;
2915 // m_referenceFrame = Quaternion.Identity;
2916 m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
2917 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
2918 m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
2919 break;
2920 case Vehicle.TYPE_BALLOON:
2921 m_linearFrictionTimescale = new Vector3(5, 5, 5);
2922 m_angularFrictionTimescale = new Vector3(10, 10, 10);
2923 m_linearMotorTimescale = 5;
2924 m_linearMotorDecayTimescale = 60;
2925 m_angularMotorDirection = Vector3.Zero;
2926 m_angularMotorDVel = Vector3.Zero;
2927 m_angularMotorTimescale = 6;
2928 m_angularMotorDecayTimescale = 10;
2929 m_VhoverHeight = 5;
2930// m_VhoverEfficiency = 0.8f;
2931 m_VhoverTimescale = 10;
2932 m_VehicleBuoyancy = 1;
2933 // m_linearDeflectionEfficiency = 0;
2934 // m_linearDeflectionTimescale = 5;
2935 // m_angularDeflectionEfficiency = 0;
2936 // m_angularDeflectionTimescale = 5;
2937 m_verticalAttractionEfficiency = 1f;
2938 m_verticalAttractionTimescale = 100f;
2939 // m_bankingEfficiency = 0;
2940 // m_bankingMix = 0.7f;
2941 // m_bankingTimescale = 5;
2942 // m_referenceFrame = Quaternion.Identity;
2943 m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
2944 VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
2945 m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
2946 break;
2947
2948 }
2949 }//end SetDefaultsForType
2950
2951 internal void Enable(IntPtr pBody, OdeScene pParentScene)
2952 {
2953 if (m_type == Vehicle.TYPE_NONE)
2954 return;
2955
2956 m_body = pBody;
2957 }
2958
2959
2960 internal void Halt()
2961 { // Kill all motions, when non-physical
2962 // m_linearMotorDirection = Vector3.Zero;
2963 m_lLinMotorDVel = Vector3.Zero;
2964 m_lLinObjectVel = Vector3.Zero;
2965 m_wLinObjectVel = Vector3.Zero;
2966 m_angularMotorDirection = Vector3.Zero;
2967 m_lastAngularVelocity = Vector3.Zero;
2968 m_angularMotorDVel = Vector3.Zero;
2969 _acceleration = Vector3.Zero;
2970 }
2971
2972 private void UpdateLinDecay()
2973 {
2974// if (Math.Abs(m_linearMotorDirection.X) > Math.Abs(m_lLinMotorDVel.X)) m_lLinMotorDVel.X = m_linearMotorDirection.X;
2975// if (Math.Abs(m_linearMotorDirection.Y) > Math.Abs(m_lLinMotorDVel.Y)) m_lLinMotorDVel.Y = m_linearMotorDirection.Y;
2976// if (Math.Abs(m_linearMotorDirection.Z) > Math.Abs(m_lLinMotorDVel.Z)) m_lLinMotorDVel.Z = m_linearMotorDirection.Z;
2977 m_lLinMotorDVel.X = m_linearMotorDirection.X;
2978 m_lLinMotorDVel.Y = m_linearMotorDirection.Y;
2979 m_lLinMotorDVel.Z = m_linearMotorDirection.Z;
2980 } // else let the motor decay on its own
2981
2982 private void UpdateAngDecay()
2983 {
2984// if (Math.Abs(m_angularMotorDirection.X) > Math.Abs(m_angularMotorDVel.X)) m_angularMotorDVel.X = m_angularMotorDirection.X;
2985// if (Math.Abs(m_angularMotorDirection.Y) > Math.Abs(m_angularMotorDVel.Y)) m_angularMotorDVel.Y = m_angularMotorDirection.Y;
2986// if (Math.Abs(m_angularMotorDirection.Z) > Math.Abs(m_angularMotorDVel.Z)) m_angularMotorDVel.Z = m_angularMotorDirection.Z;
2987 m_angularMotorDVel.X = m_angularMotorDirection.X;
2988 m_angularMotorDVel.Y = m_angularMotorDirection.Y;
2989 m_angularMotorDVel.Z = m_angularMotorDirection.Z;
2990 } // else let the motor decay on its own
2991
2992 public void Move(float timestep)
2993 {
2994 float fx = 0;
2995 float fy = 0;
2996 float fz = 0;
2997 Vector3 linvel; // velocity applied, including any reversal
2998 int outside = 0;
2999
3000 // If geomCrossingFailuresBeforeOutofbounds is set to 0 in OpenSim.ini then phys objects bounce off region borders.
3001 // This is a temp patch until proper region crossing is developed.
3002
3003 int failureLimit = _parent_scene.geomCrossingFailuresBeforeOutofbounds;
3004 int fence = _parent_scene.geomRegionFence;
3005
3006 float border_limit = 0.05f; // original limit
3007 if (fence == 1) border_limit = 0.5f; // bounce point
3008
3009 frcount++; // used to limit debug comment output
3010 if (frcount > 50)
3011 frcount = 0;
3012
3013 if(revcount > 0) revcount--;
3014
3015 if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // Only move root prims.
3016 {
3017 // Old public void UpdatePositionAndVelocity(), more accuratley calculated here
3018 bool lastZeroFlag = _zeroFlag; // was it stopped
3019
3020 d.Vector3 vec = d.BodyGetPosition(Body);
3021 Vector3 l_position = Vector3.Zero;
3022 l_position.X = vec.X;
3023 l_position.Y = vec.Y;
3024 l_position.Z = vec.Z;
3025 m_lastposition = _position;
3026 _position = l_position;
3027
3028 d.Quaternion ori = d.BodyGetQuaternion(Body);
3029 // Quaternion l_orientation = Quaternion.Identity;
3030 _orientation.X = ori.X;
3031 _orientation.Y = ori.Y;
3032 _orientation.Z = ori.Z;
3033 _orientation.W = ori.W;
3034 m_lastorientation = _orientation;
3035
3036 d.Vector3 vel = d.BodyGetLinearVel(Body);
3037 m_lastVelocity = _velocity;
3038 _velocity.X = vel.X;
3039 _velocity.Y = vel.Y;
3040 _velocity.Z = vel.Z;
3041 _acceleration = ((_velocity - m_lastVelocity) / timestep);
3042
3043 d.Vector3 torque = d.BodyGetTorque(Body);
3044 _torque = new Vector3(torque.X, torque.Y, torque.Z);
3045
3046 base.RequestPhysicsterseUpdate();
3047
3048//Console.WriteLine("Move {0} at {1}", m_primName, l_position);
3049
3050 // Check if outside region
3051 // In Scene.cs/CrossPrimGroupIntoNewRegion the object is checked for 0.1M from border!
3052 if (l_position.X > ((float)_parent_scene.WorldExtents.X - border_limit))
3053 {
3054 l_position.X = ((float)_parent_scene.WorldExtents.X - border_limit);
3055 outside = 1;
3056 }
3057
3058 if (l_position.X < border_limit)
3059 {
3060 l_position.X = border_limit;
3061 outside = 2;
3062 }
3063 if (l_position.Y > ((float)_parent_scene.WorldExtents.Y - border_limit))
3064 {
3065 l_position.Y = ((float)_parent_scene.WorldExtents.Y - border_limit);
3066 outside = 3;
3067 }
3068
3069 if (l_position.Y < border_limit)
3070 {
3071 l_position.Y = border_limit;
3072 outside = 4;
3073 }
3074
3075 if (outside > 0)
3076 {
3077//Console.WriteLine(" fence = {0}",fence);
3078
3079//Console.WriteLine("Border {0}", l_position);
3080 if (fence == 1) // bounce object off boundary
3081 {
3082 if (revcount == 0)
3083 {
3084 if (outside < 3)
3085 {
3086 _velocity.X = -_velocity.X;
3087 }
3088 else
3089 {
3090 _velocity.Y = -_velocity.Y;
3091 }
3092 if (m_type != Vehicle.TYPE_NONE) Halt();
3093 _position = l_position;
3094 m_taintposition = _position;
3095 m_lastVelocity = _velocity;
3096 _acceleration = Vector3.Zero;
3097 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
3098 d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z);
3099 base.RequestPhysicsterseUpdate();
3100
3101 revcount = 25; // wait for object to move away from border
3102 }
3103 } // else old crossing mode
3104 else if (m_crossingfailures < failureLimit)
3105 { // keep trying to cross?
3106 _position = l_position;
3107 //_parent_scene.remActivePrim(this);
3108 if (_parent == null) base.RequestPhysicsterseUpdate();
3109 return; // Dont process any other motion?
3110 }
3111 else
3112 { // Too many tries
3113 if (_parent == null) base.RaiseOutOfBounds(l_position);
3114//Console.WriteLine("ROOB 2");
3115
3116 return; // Dont process any other motion?
3117 } // end various methods
3118 } // end outside region horizontally
3119
3120
3121 if (l_position.Z < 0)
3122 {
3123 // This is so prim that get lost underground don't fall forever and suck up
3124 //
3125 // Sim resources and memory.
3126 // Disables the prim's movement physics....
3127 // It's a hack and will generate a console message if it fails.
3128
3129 //IsPhysical = false;
3130 if (_parent == null) base.RaiseOutOfBounds(_position);
3131//Console.WriteLine("ROOB 3");
3132
3133
3134 _acceleration.X = 0; // This stuff may stop client display but it has no
3135 _acceleration.Y = 0; // effect on the object in phys engine!
3136 _acceleration.Z = 0;
3137
3138 _velocity.X = 0;
3139 _velocity.Y = 0;
3140 _velocity.Z = 0;
3141 m_rotationalVelocity.X = 0;
3142 m_rotationalVelocity.Y = 0;
3143 m_rotationalVelocity.Z = 0;
3144
3145 if (_parent == null) base.RequestPhysicsterseUpdate();
3146
3147 m_throttleUpdates = false;
3148 throttleCounter = 0;
3149 _zeroFlag = true;
3150 //outofBounds = true;
3151 } // end neg Z check
3152
3153 // Is it moving?
3154 if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
3155 && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)
3156 && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02)
3157 && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, _orientation)) < 0.0001)) // KF 0.01 is far to large
3158 {
3159 _zeroFlag = true;
3160 m_throttleUpdates = false;
3161 }
3162 else
3163 {
3164 //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString());
3165 _zeroFlag = false;
3166 m_lastUpdateSent = false;
3167 //m_throttleUpdates = false;
3168 }
3169
3170 if (_zeroFlag)
3171 { // Its stopped
3172 _velocity.X = 0.0f;
3173 _velocity.Y = 0.0f;
3174 _velocity.Z = 0.0f;
3175
3176 _acceleration.X = 0;
3177 _acceleration.Y = 0;
3178 _acceleration.Z = 0;
3179
3180 m_rotationalVelocity.X = 0;
3181 m_rotationalVelocity.Y = 0;
3182 m_rotationalVelocity.Z = 0;
3183 if (!m_lastUpdateSent)
3184 {
3185 m_throttleUpdates = false;
3186 throttleCounter = 0;
3187 if (_parent == null)
3188 {
3189 base.RequestPhysicsterseUpdate();
3190 }
3191
3192 m_lastUpdateSent = true;
3193 }
3194 }
3195 else
3196 { // Its moving
3197 if (lastZeroFlag != _zeroFlag)
3198 {
3199 if (_parent == null)
3200 {
3201 base.RequestPhysicsterseUpdate();
3202 }
3203 }
3204 m_lastUpdateSent = false;
3205 if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate)
3206 {
3207 if (_parent == null)
3208 {
3209 base.RequestPhysicsterseUpdate();
3210 }
3211 }
3212 else
3213 {
3214 throttleCounter++;
3215 }
3216 }
3217 m_lastposition = l_position;
3218
3219 /// End UpdatePositionAndVelocity insert
3220
3221
3222 // Rotation lock =====================================
3223 if(m_rotateEnableUpdate)
3224 {
3225 // Snapshot current angles, set up Amotor(s)
3226 m_rotateEnableUpdate = false;
3227 m_rotateEnable = m_rotateEnableRequest;
3228Console.WriteLine("RotEnable {0} = {1}",m_primName, m_rotateEnable);
3229
3230 if (Amotor != IntPtr.Zero)
3231 {
3232 d.JointDestroy(Amotor);
3233 Amotor = IntPtr.Zero;
3234Console.WriteLine("Old Amotor Destroyed");
3235 }
3236
3237 if (!m_rotateEnable.ApproxEquals(Vector3.One, 0.003f))
3238 { // not all are enabled
3239 d.Quaternion r = d.BodyGetQuaternion(Body);
3240 Quaternion locrot = new Quaternion(r.X, r.Y, r.Z, r.W);
3241 // extract the axes vectors
3242 Vector3 vX = new Vector3(1f,0f,0f);
3243 Vector3 vY = new Vector3(0f,1f,0f);
3244 Vector3 vZ = new Vector3(0f,0f,1f);
3245 vX = vX * locrot;
3246 vY = vY * locrot;
3247 vZ = vZ * locrot;
3248 // snapshot the current angle vectors
3249 m_lockX = vX;
3250 m_lockY = vY;
3251 m_lockZ = vZ;
3252 // m_lockRot = locrot;
3253 Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
3254 d.JointAttach(Amotor, Body, IntPtr.Zero);
3255 d.JointSetAMotorMode(Amotor, 0); // User mode??
3256Console.WriteLine("New Amotor Created for {0}", m_primName);
3257
3258 float axisnum = 3; // how many to lock
3259 axisnum = (axisnum - (m_rotateEnable.X + m_rotateEnable.Y + m_rotateEnable.Z));
3260 d.JointSetAMotorNumAxes(Amotor,(int)axisnum);
3261Console.WriteLine("AxisNum={0}",(int)axisnum);
3262
3263 int i = 0;
3264
3265 if (m_rotateEnable.X == 0)
3266 {
3267 d.JointSetAMotorAxis(Amotor, i, 0, m_lockX.X, m_lockX.Y, m_lockX.Z);
3268Console.WriteLine("AxisX {0} set to {1}", i, m_lockX);
3269 i++;
3270 }
3271
3272 if (m_rotateEnable.Y == 0)
3273 {
3274 d.JointSetAMotorAxis(Amotor, i, 0, m_lockY.X, m_lockY.Y, m_lockY.Z);
3275Console.WriteLine("AxisY {0} set to {1}", i, m_lockY);
3276 i++;
3277 }
3278
3279 if (m_rotateEnable.Z == 0)
3280 {
3281 d.JointSetAMotorAxis(Amotor, i, 0, m_lockZ.X, m_lockZ.Y, m_lockZ.Z);
3282Console.WriteLine("AxisZ {0} set to {1}", i, m_lockZ);
3283 i++;
3284 }
3285
3286 // These lowstops and high stops are effectively (no wiggle room)
3287 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, 0f);
3288 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, 0f);
3289 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, 0f);
3290 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0f);
3291 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f);
3292 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0f);
3293 d.JointSetAMotorParam(Amotor, (int) dParam.Vel, 0f);
3294 d.JointSetAMotorParam(Amotor, (int) dParam.Vel3, 0f);
3295 d.JointSetAMotorParam(Amotor, (int) dParam.Vel2, 0f);
3296 d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM, 0f);
3297 d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM3, 0f);
3298 d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM2, 0f);
3299 } // else none are locked
3300 } // end Rotation Update
3301
3302
3303 // VEHICLE processing ==========================================
3304 if (m_type != Vehicle.TYPE_NONE)
3305 {
3306 // get body attitude
3307 d.Quaternion rot = d.BodyGetQuaternion(Body);
3308 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W); // rotq = rotation of object
3309 Quaternion irotq = Quaternion.Inverse(rotq);
3310
3311 // VEHICLE Linear Motion
3312 d.Vector3 velnow = d.BodyGetLinearVel(Body); // this is in world frame
3313 Vector3 vel_now = new Vector3(velnow.X, velnow.Y, velnow.Z);
3314 m_lLinObjectVel = vel_now * irotq;
3315
3316 if (m_linearMotorDecayTimescale < 300.0f) //setting of 300 or more disables decay rate
3317 {
3318 if ( Vector3.Mag(m_lLinMotorDVel) < 1.0f)
3319 {
3320 float decayfactor = m_linearMotorDecayTimescale/timestep;
3321 Vector3 decayAmount = (m_lLinMotorDVel/decayfactor);
3322 m_lLinMotorDVel -= decayAmount;
3323 }
3324 else
3325 {
3326 float decayfactor = 3.0f - (0.57f * (float)Math.Log((double)(m_linearMotorDecayTimescale)));
3327 Vector3 decel = Vector3.Normalize(m_lLinMotorDVel) * decayfactor * timestep;
3328 m_lLinMotorDVel -= decel;
3329 }
3330 if (m_lLinMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
3331 {
3332 m_lLinMotorDVel = Vector3.Zero;
3333 }
3334
3335 /* else
3336 {
3337 if (Math.Abs(m_lLinMotorDVel.X) < Math.Abs(m_lLinObjectVel.X)) m_lLinObjectVel.X = m_lLinMotorDVel.X;
3338 if (Math.Abs(m_lLinMotorDVel.Y) < Math.Abs(m_lLinObjectVel.Y)) m_lLinObjectVel.Y = m_lLinMotorDVel.Y;
3339 if (Math.Abs(m_lLinMotorDVel.Z) < Math.Abs(m_lLinObjectVel.Z)) m_lLinObjectVel.Z = m_lLinMotorDVel.Z;
3340 } */
3341 } // end linear motor decay
3342
3343 if ( (! m_lLinMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) || (! m_lLinObjectVel.ApproxEquals(Vector3.Zero, 0.01f)) )
3344 {
3345 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
3346 if (m_linearMotorTimescale < 300.0f)
3347 {
3348 Vector3 attack_error = m_lLinMotorDVel - m_lLinObjectVel;
3349 float linfactor = m_linearMotorTimescale/timestep;
3350 Vector3 attackAmount = (attack_error/linfactor) * 1.3f;
3351 m_lLinObjectVel += attackAmount;
3352 }
3353 if (m_linearFrictionTimescale.X < 300.0f)
3354 {
3355 float fricfactor = m_linearFrictionTimescale.X / timestep;
3356 float fricX = m_lLinObjectVel.X / fricfactor;
3357 m_lLinObjectVel.X -= fricX;
3358 }
3359 if (m_linearFrictionTimescale.Y < 300.0f)
3360 {
3361 float fricfactor = m_linearFrictionTimescale.Y / timestep;
3362 float fricY = m_lLinObjectVel.Y / fricfactor;
3363 m_lLinObjectVel.Y -= fricY;
3364 }
3365 if (m_linearFrictionTimescale.Z < 300.0f)
3366 {
3367 float fricfactor = m_linearFrictionTimescale.Z / timestep;
3368 float fricZ = m_lLinObjectVel.Z / fricfactor;
3369 m_lLinObjectVel.Z -= fricZ;
3370 }
3371 }
3372 m_wLinObjectVel = m_lLinObjectVel * rotq;
3373
3374 // Gravity and Buoyancy
3375 Vector3 grav = Vector3.Zero;
3376 if(m_VehicleBuoyancy < 1.0f)
3377 {
3378 // There is some gravity, make a gravity force vector
3379 // that is applied after object velocity.
3380 d.Mass objMass;
3381 d.BodyGetMass(Body, out objMass);
3382 // m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g;
3383 grav.Z = _parent_scene.gravityz * objMass.mass * (1f - m_VehicleBuoyancy); // Applied later as a force
3384 } // else its 1.0, no gravity.
3385
3386 // Hovering
3387 if( (m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
3388 {
3389 // We should hover, get the target height
3390 d.Vector3 pos = d.BodyGetPosition(Body);
3391 if((m_flags & VehicleFlag.HOVER_WATER_ONLY) == VehicleFlag.HOVER_WATER_ONLY)
3392 {
3393 m_VhoverTargetHeight = _parent_scene.GetWaterLevel() + m_VhoverHeight;
3394 }
3395 else if((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) == VehicleFlag.HOVER_TERRAIN_ONLY)
3396 {
3397 m_VhoverTargetHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
3398 }
3399 else if((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == VehicleFlag.HOVER_GLOBAL_HEIGHT)
3400 {
3401 m_VhoverTargetHeight = m_VhoverHeight;
3402 }
3403
3404 if((m_flags & VehicleFlag.HOVER_UP_ONLY) == VehicleFlag.HOVER_UP_ONLY)
3405 {
3406 // If body is aready heigher, use its height as target height
3407 if(pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
3408 }
3409
3410// m_VhoverEfficiency = 0f; // 0=boucy, 1=Crit.damped
3411// m_VhoverTimescale = 0f; // time to acheive height
3412// timestep is time since last frame,in secs
3413 float herr0 = pos.Z - m_VhoverTargetHeight;
3414 // Replace Vertical speed with correction figure if significant
3415 if(Math.Abs(herr0) > 0.01f )
3416 {
3417 //? d.Mass objMass;
3418 //? d.BodyGetMass(Body, out objMass);
3419 m_wLinObjectVel.Z = - ( (herr0 * timestep * 50.0f) / m_VhoverTimescale);
3420 //KF: m_VhoverEfficiency is not yet implemented
3421 }
3422 else
3423 {
3424 m_wLinObjectVel.Z = 0f;
3425 }
3426 }
3427 else
3428 { // not hovering
3429 if (m_wLinObjectVel.Z == 0f)
3430 { // Gravity rules
3431 m_wLinObjectVel.Z = vel_now.Z;
3432 } // else the motor has it
3433 }
3434 linvel = m_wLinObjectVel;
3435
3436 // Vehicle Linear Motion done =======================================
3437 // Apply velocity
3438 d.BodySetLinearVel(Body, linvel.X, linvel.Y, linvel.Z);
3439 // apply gravity force
3440 d.BodyAddForce(Body, grav.X, grav.Y, grav.Z);
3441//if(frcount == 0) Console.WriteLine("Grav {0}", grav);
3442 // end MoveLinear()
3443
3444
3445 // MoveAngular
3446 /*
3447 private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
3448
3449 private float m_angularMotorTimescale = 0; // motor angular Attack rate set by LSL
3450 private float m_angularMotorDecayTimescale = 0; // motor angular Decay rate set by LSL
3451 private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular Friction set by LSL
3452
3453 private Vector3 m_angularMotorDVel = Vector3.Zero; // decayed angular motor
3454 private Vector3 m_angObjectVel = Vector3.Zero; // what was last applied to body
3455 */
3456//if(frcount == 0) Console.WriteLine("MoveAngular ");
3457
3458 d.Vector3 angularObjectVel = d.BodyGetAngularVel(Body);
3459 Vector3 angObjectVel = new Vector3(angularObjectVel.X, angularObjectVel.Y, angularObjectVel.Z);
3460 angObjectVel = angObjectVel * irotq; // ============ Converts to LOCAL rotation
3461
3462//if(frcount == 0) Console.WriteLine("V0 = {0}", angObjectVel);
3463
3464 // Decay Angular Motor 1. In SL this also depends on attack rate! decay ~= 23/Attack.
3465 float atk_decayfactor = 23.0f / (m_angularMotorTimescale * timestep);
3466 m_angularMotorDVel -= m_angularMotorDVel / atk_decayfactor;
3467 // Decay Angular Motor 2.
3468 if (m_angularMotorDecayTimescale < 300.0f)
3469 {
3470 if ( Vector3.Mag(m_angularMotorDVel) < 1.0f)
3471 {
3472 float decayfactor = (m_angularMotorDecayTimescale)/timestep;
3473 Vector3 decayAmount = (m_angularMotorDVel/decayfactor);
3474 m_angularMotorDVel -= decayAmount;
3475 }
3476 else
3477 {
3478 Vector3 decel = Vector3.Normalize(m_angularMotorDVel) * timestep / m_angularMotorDecayTimescale;
3479 m_angularMotorDVel -= decel;
3480 }
3481
3482 if (m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
3483 {
3484 m_angularMotorDVel = Vector3.Zero;
3485 }
3486 else
3487 {
3488 if (Math.Abs(m_angularMotorDVel.X) < Math.Abs(angObjectVel.X)) angObjectVel.X = m_angularMotorDVel.X;
3489 if (Math.Abs(m_angularMotorDVel.Y) < Math.Abs(angObjectVel.Y)) angObjectVel.Y = m_angularMotorDVel.Y;
3490 if (Math.Abs(m_angularMotorDVel.Z) < Math.Abs(angObjectVel.Z)) angObjectVel.Z = m_angularMotorDVel.Z;
3491 }
3492 } // end decay angular motor
3493//if(frcount == 0) Console.WriteLine("MotorDvel {0} Obj {1}", m_angularMotorDVel, angObjectVel);
3494
3495//if(frcount == 0) Console.WriteLine("VA = {0}", angObjectVel);
3496
3497 if ( (! m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) || (! angObjectVel.ApproxEquals(Vector3.Zero, 0.01f)) )
3498 { // if motor or object have motion
3499 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
3500
3501 if (m_angularMotorTimescale < 300.0f)
3502 {
3503 Vector3 attack_error = m_angularMotorDVel - angObjectVel;
3504 float angfactor = m_angularMotorTimescale/timestep;
3505 Vector3 attackAmount = (attack_error/angfactor);
3506 angObjectVel += attackAmount;
3507//if(frcount == 0) Console.WriteLine("Accel {0} Attk {1}",FrAaccel, attackAmount);
3508//if(frcount == 0) Console.WriteLine("V2+= {0}", angObjectVel);
3509 }
3510
3511 angObjectVel.X -= angObjectVel.X / (m_angularFrictionTimescale.X * 0.7f / timestep);
3512 angObjectVel.Y -= angObjectVel.Y / (m_angularFrictionTimescale.Y * 0.7f / timestep);
3513 angObjectVel.Z -= angObjectVel.Z / (m_angularFrictionTimescale.Z * 0.7f / timestep);
3514 } // else no signif. motion
3515
3516//if(frcount == 0) Console.WriteLine("Dmotor {0} Obj {1}", m_angularMotorDVel, angObjectVel);
3517 // Bank section tba
3518 // Deflection section tba
3519//if(frcount == 0) Console.WriteLine("V3 = {0}", angObjectVel);
3520
3521
3522 /* // Rotation Axis Disables:
3523 if (!m_angularEnable.ApproxEquals(Vector3.One, 0.003f))
3524 {
3525 if (m_angularEnable.X == 0)
3526 angObjectVel.X = 0f;
3527 if (m_angularEnable.Y == 0)
3528 angObjectVel.Y = 0f;
3529 if (m_angularEnable.Z == 0)
3530 angObjectVel.Z = 0f;
3531 }
3532 */
3533 angObjectVel = angObjectVel * rotq; // ================ Converts to WORLD rotation
3534
3535 // Vertical attractor section
3536 Vector3 vertattr = Vector3.Zero;
3537
3538 if(m_verticalAttractionTimescale < 300)
3539 {
3540 float VAservo = 1.0f / (m_verticalAttractionTimescale * timestep);
3541 // make a vector pointing up
3542 Vector3 verterr = Vector3.Zero;
3543 verterr.Z = 1.0f;
3544 // rotate it to Body Angle
3545 verterr = verterr * rotq;
3546 // verterr.X and .Y are the World error ammounts. They are 0 when there is no error (Vehicle Body is 'vertical'), and .Z will be 1.
3547 // As the body leans to its side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall and .Z will go
3548 // negative. Similar for tilt and |.Y|. .X and .Y must be modulated to prevent a stable inverted body.
3549
3550 if (verterr.Z < 0.0f)
3551 { // Deflection from vertical exceeds 90-degrees. This method will ensure stable return to
3552 // vertical, BUT for some reason a z-rotation is imparted to the object. TBI.
3553//Console.WriteLine("InvertFlip");
3554 verterr.X = 2.0f - verterr.X;
3555 verterr.Y = 2.0f - verterr.Y;
3556 }
3557 verterr *= 0.5f;
3558 // verterror is 0 (no error) to +/- 1 (max error at 180-deg tilt)
3559 Vector3 xyav = angObjectVel;
3560 xyav.Z = 0.0f;
3561 if ((!xyav.ApproxEquals(Vector3.Zero, 0.001f)) || (verterr.Z < 0.49f))
3562 {
3563 // As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so
3564 // Change Body angular velocity X based on Y, and Y based on X. Z is not changed.
3565 vertattr.X = verterr.Y;
3566 vertattr.Y = - verterr.X;
3567 vertattr.Z = 0f;
3568//if(frcount == 0) Console.WriteLine("VAerr=" + verterr);
3569
3570 // scaling appears better usingsquare-law
3571 float damped = m_verticalAttractionEfficiency * m_verticalAttractionEfficiency;
3572 float bounce = 1.0f - damped;
3573 // 0 = crit damp, 1 = bouncy
3574 float oavz = angObjectVel.Z; // retain z velocity
3575 // time-scaled correction, which sums, therefore is bouncy:
3576 angObjectVel = (angObjectVel + (vertattr * VAservo * 0.0333f)) * bounce;
3577 // damped, good @ < 90:
3578 angObjectVel = angObjectVel + (vertattr * VAservo * 0.0667f * damped);
3579 angObjectVel.Z = oavz;
3580//if(frcount == 0) Console.WriteLine("VA+");
3581//Console.WriteLine("VAttr {0} OAvel {1}", vertattr, angObjectVel);
3582 }
3583 else
3584 {
3585 // else error is very small
3586 angObjectVel.X = 0f;
3587 angObjectVel.Y = 0f;
3588//if(frcount == 0) Console.WriteLine("VA0");
3589 }
3590 } // else vertical attractor is off
3591//if(frcount == 0) Console.WriteLine("V1 = {0}", angObjectVel);
3592
3593
3594 m_lastAngularVelocity = angObjectVel;
3595 // apply Angular Velocity to body
3596 d.BodySetAngularVel (Body, m_lastAngularVelocity.X, m_lastAngularVelocity.Y, m_lastAngularVelocity.Z);
3597//if(frcount == 0) Console.WriteLine("V4 = {0}", m_lastAngularVelocity);
3598
3599 } // end VEHICLES
3600 else
3601 {
3602 // Dyamics (NON-'VEHICLES') are dealt with here ================================================================
3603
3604 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
3605
3606 /// Dynamics Buoyancy
3607 //KF: m_buoyancy is set by llSetBuoyancy() and is for non-vehicle.
3608 // m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up
3609 // NB Prims in ODE are no subject to global gravity
3610 // This should only affect gravity operations
3611
3612 float m_mass = CalculateMass();
3613 // calculate z-force due togravity on object.
3614 fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass; // force = acceleration * mass
3615
3616 if ((m_usePID) && (m_PIDTau > 0.0f)) // Dynamics llMoveToTarget.
3617 {
3618 fz = 0; // llMoveToTarget ignores gravity.
3619 // it also ignores mass of object, and any physical resting on it.
3620 // Vector3 m_PIDTarget is where we are going
3621 // float m_PIDTau is time to get there
3622 fx = 0;
3623 fy = 0;
3624 d.Vector3 pos = d.BodyGetPosition(Body);
3625 Vector3 error = new Vector3(
3626 (m_PIDTarget.X - pos.X),
3627 (m_PIDTarget.Y - pos.Y),
3628 (m_PIDTarget.Z - pos.Z));
3629 if (error.ApproxEquals(Vector3.Zero,0.01f))
3630 { // Very close, Jump there and quit move
3631 d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);
3632 _target_velocity = Vector3.Zero;
3633 d.BodySetLinearVel(Body, _target_velocity.X, _target_velocity.Y, _target_velocity.Z);
3634 }
3635 else
3636 {
3637 float scale = 50.0f * timestep / m_PIDTau;
3638 if ((error.ApproxEquals(Vector3.Zero,0.5f)) && (_target_velocity != Vector3.Zero))
3639 {
3640 // Nearby, quit update of velocity
3641 }
3642 else
3643 { // Far, calc damped velocity
3644 _target_velocity = error * scale;
3645 }
3646 d.BodySetLinearVel(Body, _target_velocity.X, _target_velocity.Y, _target_velocity.Z);
3647 }
3648 } // end PID MoveToTarget
3649
3650 /* Original OS implementation: Does not work correctly as another phys object resting on THIS object purturbs its position.
3651 This is incorrect behavior. llMoveToTarget must move the Body no matter what phys object is resting on it.
3652
3653 //if (!d.BodyIsEnabled(Body))
3654 //d.BodySetForce(Body, 0f, 0f, 0f);
3655
3656 // no lock; for now it's only called from within Simulate()
3657
3658 // If the PID Controller isn't active then we set our force
3659 // calculating base velocity to the current position
3660
3661 if ((m_PIDTau < 1) && (m_PIDTau != 0))
3662 {
3663 //PID_G = PID_G / m_PIDTau;
3664 m_PIDTau = 1;
3665 }
3666
3667 if ((PID_G - m_PIDTau) <= 0)
3668 {
3669 PID_G = m_PIDTau + 1;
3670 }
3671 //PidStatus = true;
3672
3673 // PhysicsVector vec = new PhysicsVector();
3674// d.Vector3 vel = d.BodyGetLinearVel(Body);
3675
3676 d.Vector3 pos = d.BodyGetPosition(Body);
3677 _target_velocity =
3678 new Vector3(
3679 (m_PIDTarget.X - pos.X) * ((PID_G - m_PIDTau) * timestep),
3680 (m_PIDTarget.Y - pos.Y) * ((PID_G - m_PIDTau) * timestep),
3681 (m_PIDTarget.Z - pos.Z) * ((PID_G - m_PIDTau) * timestep)
3682 );
3683
3684if(frcount == 0) Console.WriteLine("PID {0} b={1} fz={2} vel={3}", m_primName, m_buoyancy, fz, _target_velocity);
3685 // if velocity is zero, use position control; otherwise, velocity control
3686
3687 if (_target_velocity.ApproxEquals(Vector3.Zero,0.1f))
3688 {
3689 // keep track of where we stopped. No more slippin' & slidin'
3690
3691 // We only want to deactivate the PID Controller if we think we want to have our surrogate
3692 // react to the physics scene by moving it's position.
3693 // Avatar to Avatar collisions
3694 // Prim to avatar collisions
3695
3696 //fx = (_target_velocity.X - vel.X) * (PID_D) + (_zeroPosition.X - pos.X) * (PID_P * 2);
3697 //fy = (_target_velocity.Y - vel.Y) * (PID_D) + (_zeroPosition.Y - pos.Y) * (PID_P * 2);
3698 //fz = fz + (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
3699 d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);
3700 d.BodySetLinearVel(Body, 0, 0, 0);
3701 d.BodyAddForce(Body, 0, 0, fz);
3702 // return;
3703 }
3704 else
3705 {
3706 _zeroFlag = false;
3707
3708 // We're flying and colliding with something
3709 fx = ((_target_velocity.X) - vel.X) * (PID_D);
3710 fy = ((_target_velocity.Y) - vel.Y) * (PID_D);
3711
3712 // vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P;
3713
3714 fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
3715 }
3716 } // end if (m_usePID)
3717 End of old PID system */
3718
3719
3720 /// Dynamics Hover ===================================================================================
3721 // Hover PID Controller can only run if the PIDcontroller is not in use.
3722 if (m_useHoverPID && !m_usePID)
3723 {
3724//Console.WriteLine("Hover " + m_primName);
3725
3726 // If we're using the PID controller, then we have no gravity
3727 fz = (-1 * _parent_scene.gravityz) * m_mass;
3728
3729 // no lock; for now it's only called from within Simulate()
3730
3731 // If the PID Controller isn't active then we set our force
3732 // calculating base velocity to the current position
3733
3734 if ((m_PIDTau < 1))
3735 {
3736 PID_G = PID_G / m_PIDTau;
3737 }
3738
3739 if ((PID_G - m_PIDTau) <= 0)
3740 {
3741 PID_G = m_PIDTau + 1;
3742 }
3743
3744
3745 // Where are we, and where are we headed?
3746 d.Vector3 pos = d.BodyGetPosition(Body);
3747// d.Vector3 vel = d.BodyGetLinearVel(Body);
3748
3749
3750 // Non-Vehicles have a limited set of Hover options.
3751 // determine what our target height really is based on HoverType
3752 switch (m_PIDHoverType)
3753 {
3754 case PIDHoverType.Ground:
3755 m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
3756 m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
3757 break;
3758 case PIDHoverType.GroundAndWater:
3759 m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
3760 m_waterHeight = _parent_scene.GetWaterLevel();
3761 if (m_groundHeight > m_waterHeight)
3762 {
3763 m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
3764 }
3765 else
3766 {
3767 m_targetHoverHeight = m_waterHeight + m_PIDHoverHeight;
3768 }
3769 break;
3770
3771 } // end switch (m_PIDHoverType)
3772
3773
3774 _target_velocity =
3775 new Vector3(0.0f, 0.0f,
3776 (m_targetHoverHeight - pos.Z) * ((PID_G - m_PIDHoverTau) * timestep)
3777 );
3778
3779 // if velocity is zero, use position control; otherwise, velocity control
3780
3781 if (_target_velocity.ApproxEquals(Vector3.Zero, 0.1f))
3782 {
3783 // keep track of where we stopped. No more slippin' & slidin'
3784
3785 // We only want to deactivate the PID Controller if we think we want to have our surrogate
3786 // react to the physics scene by moving it's position.
3787 // Avatar to Avatar collisions
3788 // Prim to avatar collisions
3789 d.Vector3 dlinvel = vel;
3790
3791 d.BodySetPosition(Body, pos.X, pos.Y, m_targetHoverHeight);
3792 d.BodySetLinearVel(Body, dlinvel.X, dlinvel.Y, dlinvel.Z);
3793 d.BodyAddForce(Body, 0, 0, fz);
3794 //KF this prevents furthur motions return;
3795 }
3796 else
3797 {
3798 _zeroFlag = false;
3799
3800 // We're flying and colliding with something
3801 fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
3802 }
3803 } // end m_useHoverPID && !m_usePID
3804
3805 /// Dynamics RotLookAt =================================================================================
3806 if (m_useAPID)
3807 {
3808 // RotLookAt, apparently overrides all other rotation sources. Inputs:
3809 // Quaternion m_APIDTarget
3810 // float m_APIDStrength // From SL experiments, this is the time to get there
3811 // float m_APIDDamping // From SL experiments, this is damping, 1.0 = damped, 0.1 = wobbly
3812 // Also in SL the mass of the object has no effect on time to get there.
3813 // Factors:
3814 // get present body rotation
3815 float limit = 1.0f;
3816 float scaler = 50f; // adjusts damping time
3817 float RLAservo = 0f;
3818
3819 d.Quaternion rot = d.BodyGetQuaternion(Body);
3820 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
3821 Quaternion rot_diff = Quaternion.Inverse(rotq) * m_APIDTarget;
3822 float diff_angle;
3823 Vector3 diff_axis;
3824 rot_diff.GetAxisAngle(out diff_axis, out diff_angle);
3825 diff_axis.Normalize();
3826 if(diff_angle > 0.01f) // diff_angle is always +ve
3827 {
3828// PhysicsVector rotforce = new PhysicsVector(diff_axis.X, diff_axis.Y, diff_axis.Z);
3829 Vector3 rotforce = new Vector3(diff_axis.X, diff_axis.Y, diff_axis.Z);
3830 rotforce = rotforce * rotq;
3831 if(diff_angle > limit) diff_angle = limit; // cap the rotate rate
3832// RLAservo = timestep / m_APIDStrength * m_mass * scaler;
3833 // rotforce = rotforce * RLAservo * diff_angle ;
3834 // d.BodyAddRelTorque(Body, rotforce.X, rotforce.Y, rotforce.Z);
3835 RLAservo = timestep / m_APIDStrength * scaler;
3836 rotforce = rotforce * RLAservo * diff_angle ;
3837 /*
3838 if (m_angularEnable.X == 0)
3839 rotforce.X = 0;
3840 if (m_angularEnable.Y == 0)
3841 rotforce.Y = 0;
3842 if (m_angularEnable.Z == 0)
3843 rotforce.Z = 0;
3844 */
3845 d.BodySetAngularVel (Body, rotforce.X, rotforce.Y, rotforce.Z);
3846//Console.WriteLine("axis= " + diff_axis + " angle= " + diff_angle + "servo= " + RLAservo);
3847 }
3848//if(frcount == 0) Console.WriteLine("mass= " + m_mass + " servo= " + RLAservo + " angle= " + diff_angle);
3849 } // end m_useAPID
3850
3851 /// Dynamics Apply Forces ===================================================================================
3852 fx *= m_mass;
3853 fy *= m_mass;
3854 //fz *= m_mass;
3855
3856 fx += m_force.X;
3857 fy += m_force.Y;
3858 fz += m_force.Z;
3859
3860 //m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());
3861 if (fx != 0 || fy != 0 || fz != 0)
3862 {
3863 //m_taintdisable = true;
3864 //base.RaiseOutOfBounds(Position);
3865 //d.BodySetLinearVel(Body, fx, fy, 0f);
3866 if (!d.BodyIsEnabled(Body))
3867 {
3868 // A physical body at rest on a surface will auto-disable after a while,
3869 // this appears to re-enable it incase the surface it is upon vanishes,
3870 // and the body should fall again.
3871 d.BodySetLinearVel(Body, 0f, 0f, 0f);
3872 d.BodySetForce(Body, 0, 0, 0);
3873 enableBodySoft();
3874 }
3875
3876 // 35x10 = 350n times the mass per second applied maximum.
3877 float nmax = 35f * m_mass;
3878 float nmin = -35f * m_mass;
3879
3880
3881 if (fx > nmax)
3882 fx = nmax;
3883 if (fx < nmin)
3884 fx = nmin;
3885 if (fy > nmax)
3886 fy = nmax;
3887 if (fy < nmin)
3888 fy = nmin;
3889 d.BodyAddForce(Body, fx, fy, fz);
3890//Console.WriteLine("AddForce " + fx + "," + fy + "," + fz);
3891 } // end apply forces
3892 } // end Dynamics
3893
3894/* obsolete?
3895 else
3896 { // is not physical, or is not a body or is selected
3897 // from old UpdatePositionAndVelocity, ... Not a body.. so Make sure the client isn't interpolating
3898 _velocity.X = 0;
3899 _velocity.Y = 0;
3900 _velocity.Z = 0;
3901
3902 _acceleration.X = 0;
3903 _acceleration.Y = 0;
3904 _acceleration.Z = 0;
3905
3906 m_rotationalVelocity.X = 0;
3907 m_rotationalVelocity.Y = 0;
3908 m_rotationalVelocity.Z = 0;
3909 _zeroFlag = true;
3910 return;
3911 }
3912 */
3913 } // end root prims
3914
3915 } // end Move()
3916 } // end class
3917}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs
new file mode 100644
index 0000000..7314107
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs
@@ -0,0 +1,375 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Runtime.InteropServices;
32using System.Text;
33using OpenMetaverse;
34using OpenSim.Region.Physics.Manager;
35using Ode.NET;
36using log4net;
37
38namespace OpenSim.Region.Physics.OdePlugin
39{
40 /// <summary>
41 /// Processes raycast requests as ODE is in a state to be able to do them.
42 /// This ensures that it's thread safe and there will be no conflicts.
43 /// Requests get returned by a different thread then they were requested by.
44 /// </summary>
45 public class ODERayCastRequestManager
46 {
47 /// <summary>
48 /// Pending Raycast Requests
49 /// </summary>
50 protected List<ODERayCastRequest> m_PendingRequests = new List<ODERayCastRequest>();
51
52 /// <summary>
53 /// Scene that created this object.
54 /// </summary>
55 private OdeScene m_scene;
56
57 /// <summary>
58 /// ODE contact array to be filled by the collision testing
59 /// </summary>
60 d.ContactGeom[] contacts = new d.ContactGeom[5];
61
62 /// <summary>
63 /// ODE near callback delegate
64 /// </summary>
65 private d.NearCallback nearCallback;
66 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
67 private List<ContactResult> m_contactResults = new List<ContactResult>();
68
69
70 public ODERayCastRequestManager(OdeScene pScene)
71 {
72 m_scene = pScene;
73 nearCallback = near;
74
75 }
76
77 /// <summary>
78 /// Queues a raycast
79 /// </summary>
80 /// <param name="position">Origin of Ray</param>
81 /// <param name="direction">Ray normal</param>
82 /// <param name="length">Ray length</param>
83 /// <param name="retMethod">Return method to send the results</param>
84 public void QueueRequest(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
85 {
86 lock (m_PendingRequests)
87 {
88 ODERayCastRequest req = new ODERayCastRequest();
89 req.callbackMethod = retMethod;
90 req.length = length;
91 req.Normal = direction;
92 req.Origin = position;
93
94 m_PendingRequests.Add(req);
95 }
96 }
97
98 /// <summary>
99 /// Process all queued raycast requests
100 /// </summary>
101 /// <returns>Time in MS the raycasts took to process.</returns>
102 public int ProcessQueuedRequests()
103 {
104 int time = System.Environment.TickCount;
105 lock (m_PendingRequests)
106 {
107 if (m_PendingRequests.Count > 0)
108 {
109 ODERayCastRequest[] reqs = m_PendingRequests.ToArray();
110 for (int i = 0; i < reqs.Length; i++)
111 {
112 if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast
113 RayCast(reqs[i]); // if there isn't anyone to send results
114 }
115 /*
116 foreach (ODERayCastRequest req in m_PendingRequests)
117 {
118 if (req.callbackMethod != null) // quick optimization here, don't raycast
119 RayCast(req); // if there isn't anyone to send results to
120
121 }
122 */
123 m_PendingRequests.Clear();
124 }
125 }
126
127 lock (m_contactResults)
128 m_contactResults.Clear();
129
130 return System.Environment.TickCount - time;
131 }
132
133 /// <summary>
134 /// Method that actually initiates the raycast
135 /// </summary>
136 /// <param name="req"></param>
137 private void RayCast(ODERayCastRequest req)
138 {
139 // Create the ray
140 IntPtr ray = d.CreateRay(m_scene.space, req.length);
141 d.GeomRaySet(ray, req.Origin.X, req.Origin.Y, req.Origin.Z, req.Normal.X, req.Normal.Y, req.Normal.Z);
142
143 // Collide test
144 d.SpaceCollide2(m_scene.space, ray, IntPtr.Zero, nearCallback);
145
146 // Remove Ray
147 d.GeomDestroy(ray);
148
149
150 // Define default results
151 bool hitYN = false;
152 uint hitConsumerID = 0;
153 float distance = 999999999999f;
154 Vector3 closestcontact = new Vector3(99999f, 99999f, 99999f);
155 Vector3 snormal = Vector3.Zero;
156
157 // Find closest contact and object.
158 lock (m_contactResults)
159 {
160 foreach (ContactResult cResult in m_contactResults)
161 {
162 if (Vector3.Distance(req.Origin, cResult.Pos) < Vector3.Distance(req.Origin, closestcontact))
163 {
164 closestcontact = cResult.Pos;
165 hitConsumerID = cResult.ConsumerID;
166 distance = cResult.Depth;
167 hitYN = true;
168 snormal = cResult.Normal;
169 }
170 }
171
172 m_contactResults.Clear();
173 }
174
175 // Return results
176 if (req.callbackMethod != null)
177 req.callbackMethod(hitYN, closestcontact, hitConsumerID, distance, snormal);
178 }
179
180 // This is the standard Near. Uses space AABBs to speed up detection.
181 private void near(IntPtr space, IntPtr g1, IntPtr g2)
182 {
183
184 //Don't test against heightfield Geom, or you'll be sorry!
185
186 /*
187 terminate called after throwing an instance of 'std::bad_alloc'
188 what(): std::bad_alloc
189 Stacktrace:
190
191 at (wrapper managed-to-native) Ode.NET.d.Collide (intptr,intptr,int,Ode.NET.d/ContactGeom[],int) <0x00004>
192 at (wrapper managed-to-native) Ode.NET.d.Collide (intptr,intptr,int,Ode.NET.d/ContactGeom[],int) <0xffffffff>
193 at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.near (intptr,intptr,intptr) <0x00280>
194 at (wrapper native-to-managed) OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.near (intptr,intptr,intptr) <0xfff
195 fffff>
196 at (wrapper managed-to-native) Ode.NET.d.SpaceCollide2 (intptr,intptr,intptr,Ode.NET.d/NearCallback) <0x00004>
197 at (wrapper managed-to-native) Ode.NET.d.SpaceCollide2 (intptr,intptr,intptr,Ode.NET.d/NearCallback) <0xffffffff>
198 at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.RayCast (OpenSim.Region.Physics.OdePlugin.ODERayCastRequest) <
199 0x00114>
200 at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.ProcessQueuedRequests () <0x000eb>
201 at OpenSim.Region.Physics.OdePlugin.OdeScene.Simulate (single) <0x017e6>
202 at OpenSim.Region.Framework.Scenes.SceneGraph.UpdatePhysics (double) <0x00042>
203 at OpenSim.Region.Framework.Scenes.Scene.Update () <0x0039e>
204 at OpenSim.Region.Framework.Scenes.Scene.Heartbeat (object) <0x00019>
205 at (wrapper runtime-invoke) object.runtime_invoke_void__this___object (object,intptr,intptr,intptr) <0xffffffff>
206
207 Native stacktrace:
208
209 mono [0x80d2a42]
210 [0xb7f5840c]
211 /lib/i686/cmov/libc.so.6(abort+0x188) [0xb7d1a018]
212 /usr/lib/libstdc++.so.6(_ZN9__gnu_cxx27__verbose_terminate_handlerEv+0x158) [0xb45fc988]
213 /usr/lib/libstdc++.so.6 [0xb45fa865]
214 /usr/lib/libstdc++.so.6 [0xb45fa8a2]
215 /usr/lib/libstdc++.so.6 [0xb45fa9da]
216 /usr/lib/libstdc++.so.6(_Znwj+0x83) [0xb45fb033]
217 /usr/lib/libstdc++.so.6(_Znaj+0x1d) [0xb45fb11d]
218 libode.so(_ZN13dxHeightfield23dCollideHeightfieldZoneEiiiiP6dxGeomiiP12dContactGeomi+0xd04) [0xb46678e4]
219 libode.so(_Z19dCollideHeightfieldP6dxGeomS0_iP12dContactGeomi+0x54b) [0xb466832b]
220 libode.so(dCollide+0x102) [0xb46571b2]
221 [0x95cfdec9]
222 [0x8ea07fe1]
223 [0xab260146]
224 libode.so [0xb465a5c4]
225 libode.so(_ZN11dxHashSpace8collide2EPvP6dxGeomPFvS0_S2_S2_E+0x75) [0xb465bcf5]
226 libode.so(dSpaceCollide2+0x177) [0xb465ac67]
227 [0x95cf978e]
228 [0x8ea07945]
229 [0x95cf2bbc]
230 [0xab2787e7]
231 [0xab419fb3]
232 [0xab416657]
233 [0xab415bda]
234 [0xb609b08e]
235 mono(mono_runtime_delegate_invoke+0x34) [0x8192534]
236 mono [0x81a2f0f]
237 mono [0x81d28b6]
238 mono [0x81ea2c6]
239 /lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
240 /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
241 */
242
243 // Exclude heightfield geom
244
245 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
246 return;
247 if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass || d.GeomGetClass(g2) == d.GeomClassID.HeightfieldClass)
248 return;
249
250 // Raytest against AABBs of spaces first, then dig into the spaces it hits for actual geoms.
251 if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
252 {
253 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
254 return;
255
256 // Separating static prim geometry spaces.
257 // We'll be calling near recursivly if one
258 // of them is a space to find all of the
259 // contact points in the space
260 try
261 {
262 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
263 }
264 catch (AccessViolationException)
265 {
266 m_log.Warn("[PHYSICS]: Unable to collide test a space");
267 return;
268 }
269 //Colliding a space or a geom with a space or a geom. so drill down
270
271 //Collide all geoms in each space..
272 //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback);
273 //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback);
274 return;
275 }
276
277 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
278 return;
279
280 int count = 0;
281 try
282 {
283
284 if (g1 == g2)
285 return; // Can't collide with yourself
286
287 lock (contacts)
288 {
289 count = d.Collide(g1, g2, contacts.GetLength(0), contacts, d.ContactGeom.SizeOf);
290 }
291 }
292 catch (SEHException)
293 {
294 m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
295 }
296 catch (Exception e)
297 {
298 m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
299 return;
300 }
301
302 PhysicsActor p1 = null;
303 PhysicsActor p2 = null;
304
305 if (g1 != IntPtr.Zero)
306 m_scene.actor_name_map.TryGetValue(g1, out p1);
307
308 if (g2 != IntPtr.Zero)
309 m_scene.actor_name_map.TryGetValue(g1, out p2);
310
311 // Loop over contacts, build results.
312 for (int i = 0; i < count; i++)
313 {
314 if (p1 != null) {
315 if (p1 is OdePrim)
316 {
317 ContactResult collisionresult = new ContactResult();
318
319 collisionresult.ConsumerID = ((OdePrim)p1).m_localID;
320 collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
321 collisionresult.Depth = contacts[i].depth;
322 collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
323 contacts[i].normal.Z);
324 lock (m_contactResults)
325 m_contactResults.Add(collisionresult);
326 }
327 }
328
329 if (p2 != null)
330 {
331 if (p2 is OdePrim)
332 {
333 ContactResult collisionresult = new ContactResult();
334
335 collisionresult.ConsumerID = ((OdePrim)p2).m_localID;
336 collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
337 collisionresult.Depth = contacts[i].depth;
338 collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
339 contacts[i].normal.Z);
340
341 lock (m_contactResults)
342 m_contactResults.Add(collisionresult);
343 }
344 }
345
346
347 }
348
349 }
350
351 /// <summary>
352 /// Dereference the creator scene so that it can be garbage collected if needed.
353 /// </summary>
354 internal void Dispose()
355 {
356 m_scene = null;
357 }
358 }
359
360 public struct ODERayCastRequest
361 {
362 public Vector3 Origin;
363 public Vector3 Normal;
364 public float length;
365 public RaycastCallback callbackMethod;
366 }
367
368 public struct ContactResult
369 {
370 public Vector3 Pos;
371 public float Depth;
372 public uint ConsumerID;
373 public Vector3 Normal;
374 }
375}
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs
index ca7a4f8..b4a3c48 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs
@@ -26,51 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using OpenMetaverse;
30using Nini.Config; 30using Ode.NET;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Physics.Manager; 32using OpenSim.Region.Physics.Manager;
33using PhysXWrapper; 33using OpenSim.Region.Physics.OdePlugin;
34using Quaternion=OpenMetaverse.Quaternion;
35using System.Reflection;
36using log4net;
37using OpenMetaverse;
38 34
39namespace OpenSim.Region.Physics.PhysXPlugin 35namespace OpenSim.Region.Physics.OdePlugin
40{ 36{
41 /// <summary> 37 class OdePhysicsJoint : PhysicsJoint
42 /// Will be the PhysX plugin but for now will be a very basic physics engine
43 /// </summary>
44 public class PhysXPlugin : IPhysicsPlugin
45 { 38 {
46 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 public override bool IsInPhysicsEngine
47 private PhysXScene _mScene;
48
49 public PhysXPlugin()
50 {
51 }
52
53 public bool Init()
54 { 40 {
55 return true; 41 get
56 }
57
58 public PhysicsScene GetScene(string sceneIdentifier)
59 {
60 if (_mScene == null)
61 { 42 {
62 _mScene = new PhysXScene(sceneIdentifier); 43 return (jointID != IntPtr.Zero);
63 } 44 }
64 return (_mScene);
65 }
66
67 public string GetName()
68 {
69 return ("RealPhysX");
70 }
71
72 public void Dispose()
73 {
74 } 45 }
46 public IntPtr jointID;
75 } 47 }
76} 48}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
new file mode 100644
index 0000000..86f9893
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -0,0 +1,3869 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28//#define USE_DRAWSTUFF
29
30using System;
31using System.Collections.Generic;
32using System.Reflection;
33using System.Runtime.InteropServices;
34using System.Threading;
35using System.IO;
36using System.Diagnostics;
37using log4net;
38using Nini.Config;
39using Ode.NET;
40#if USE_DRAWSTUFF
41using Drawstuff.NET;
42#endif
43using OpenSim.Framework;
44using OpenSim.Region.Physics.Manager;
45using OpenMetaverse;
46
47//using OpenSim.Region.Physics.OdePlugin.Meshing;
48
49namespace OpenSim.Region.Physics.OdePlugin
50{
51 /// <summary>
52 /// ODE plugin
53 /// </summary>
54 public class OdePlugin : IPhysicsPlugin
55 {
56 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
57
58 private CollisionLocker ode;
59 private OdeScene _mScene;
60
61 public OdePlugin()
62 {
63 ode = new CollisionLocker();
64 }
65
66 public bool Init()
67 {
68 return true;
69 }
70
71 public PhysicsScene GetScene(String sceneIdentifier)
72 {
73 if (_mScene == null)
74 {
75 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
76 // http://opensimulator.org/mantis/view.php?id=2750).
77 d.InitODE();
78
79 _mScene = new OdeScene(ode, sceneIdentifier);
80 }
81 return (_mScene);
82 }
83
84 public string GetName()
85 {
86 return ("ChODE");
87 }
88
89 public void Dispose()
90 {
91 }
92 }
93
94 public enum StatusIndicators : int
95 {
96 Generic = 0,
97 Start = 1,
98 End = 2
99 }
100
101 public struct sCollisionData
102 {
103 public uint ColliderLocalId;
104 public uint CollidedWithLocalId;
105 public int NumberOfCollisions;
106 public int CollisionType;
107 public int StatusIndicator;
108 public int lastframe;
109 }
110
111 [Flags]
112 public enum CollisionCategories : int
113 {
114 Disabled = 0,
115 Geom = 0x00000001,
116 Body = 0x00000002,
117 Space = 0x00000004,
118 Character = 0x00000008,
119 Land = 0x00000010,
120 Water = 0x00000020,
121 Wind = 0x00000040,
122 Sensor = 0x00000080,
123 Selected = 0x00000100
124 }
125
126 /// <summary>
127 /// Material type for a primitive
128 /// </summary>
129 public enum Material : int
130 {
131 /// <summary></summary>
132 Stone = 0,
133 /// <summary></summary>
134 Metal = 1,
135 /// <summary></summary>
136 Glass = 2,
137 /// <summary></summary>
138 Wood = 3,
139 /// <summary></summary>
140 Flesh = 4,
141 /// <summary></summary>
142 Plastic = 5,
143 /// <summary></summary>
144 Rubber = 6
145
146 }
147
148 public sealed class OdeScene : PhysicsScene
149 {
150 private readonly ILog m_log;
151 // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
152
153 CollisionLocker ode;
154
155 private Random fluidRandomizer = new Random(Environment.TickCount);
156
157 private const uint m_regionWidth = Constants.RegionSize;
158 private const uint m_regionHeight = Constants.RegionSize;
159
160 private float ODE_STEPSIZE = 0.020f;
161 private float metersInSpace = 29.9f;
162 private float m_timeDilation = 1.0f;
163
164 public float gravityx = 0f;
165 public float gravityy = 0f;
166 public float gravityz = -9.8f;
167
168 private float contactsurfacelayer = 0.001f;
169
170 private int worldHashspaceLow = -4;
171 private int worldHashspaceHigh = 128;
172
173 private int smallHashspaceLow = -4;
174 private int smallHashspaceHigh = 66;
175
176 private float waterlevel = 0f;
177 private int framecount = 0;
178 //private int m_returncollisions = 10;
179
180 private readonly IntPtr contactgroup;
181
182 internal IntPtr LandGeom;
183 internal IntPtr WaterGeom;
184
185 private float nmTerrainContactFriction = 255.0f;
186 private float nmTerrainContactBounce = 0.1f;
187 private float nmTerrainContactERP = 0.1025f;
188
189 private float mTerrainContactFriction = 75f;
190 private float mTerrainContactBounce = 0.1f;
191 private float mTerrainContactERP = 0.05025f;
192
193 private float nmAvatarObjectContactFriction = 250f;
194 private float nmAvatarObjectContactBounce = 0.1f;
195
196 private float mAvatarObjectContactFriction = 75f;
197 private float mAvatarObjectContactBounce = 0.1f;
198
199 private float avPIDD = 3200f;
200 private float avPIDP = 1400f;
201 private float avCapRadius = 0.37f;
202 private float avStandupTensor = 2000000f;
203 private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode
204 public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } }
205 private float avDensity = 80f;
206 private float avHeightFudgeFactor = 0.52f;
207 private float avMovementDivisorWalk = 1.3f;
208 private float avMovementDivisorRun = 0.8f;
209 private float minimumGroundFlightOffset = 3f;
210 public float maximumMassObject = 10000.01f;
211
212 public bool meshSculptedPrim = true;
213 public bool forceSimplePrimMeshing = false;
214
215 public float meshSculptLOD = 32;
216 public float MeshSculptphysicalLOD = 16;
217
218 public float geomDefaultDensity = 10.000006836f;
219
220 public int geomContactPointsStartthrottle = 3;
221 public int geomUpdatesPerThrottledUpdate = 15;
222
223 public float bodyPIDD = 35f;
224 public float bodyPIDG = 25;
225
226 public int geomCrossingFailuresBeforeOutofbounds = 5;
227 public int geomRegionFence = 0;
228
229 public float bodyMotorJointMaxforceTensor = 2;
230
231 public int bodyFramesAutoDisable = 20;
232
233 private DateTime m_lastframe = DateTime.UtcNow;
234
235 private float[] _watermap;
236 private bool m_filterCollisions = true;
237
238 private d.NearCallback nearCallback;
239 public d.TriCallback triCallback;
240 public d.TriArrayCallback triArrayCallback;
241 private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
242 private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
243 private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
244 private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>();
245 private readonly Object _taintedPrimLock = new Object();
246 private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>();
247 private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>();
248 private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>();
249 private readonly List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
250 private readonly HashSet<OdeCharacter> _badCharacter = new HashSet<OdeCharacter>();
251 public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>();
252 public Dictionary<IntPtr, PhysicsActor> actor_name_map = new Dictionary<IntPtr, PhysicsActor>();
253 private bool m_NINJA_physics_joints_enabled = false;
254 //private Dictionary<String, IntPtr> jointpart_name_map = new Dictionary<String,IntPtr>();
255 private readonly Dictionary<String, List<PhysicsJoint>> joints_connecting_actor = new Dictionary<String, List<PhysicsJoint>>();
256 private d.ContactGeom[] contacts;
257 private readonly List<PhysicsJoint> requestedJointsToBeCreated = new List<PhysicsJoint>(); // lock only briefly. accessed by external code (to request new joints) and by OdeScene.Simulate() to move those joints into pending/active
258 private readonly List<PhysicsJoint> pendingJoints = new List<PhysicsJoint>(); // can lock for longer. accessed only by OdeScene.
259 private readonly List<PhysicsJoint> activeJoints = new List<PhysicsJoint>(); // can lock for longer. accessed only by OdeScene.
260 private readonly List<string> requestedJointsToBeDeleted = new List<string>(); // lock only briefly. accessed by external code (to request deletion of joints) and by OdeScene.Simulate() to move those joints out of pending/active
261 private Object externalJointRequestsLock = new Object();
262 private readonly Dictionary<String, PhysicsJoint> SOPName_to_activeJoint = new Dictionary<String, PhysicsJoint>();
263 private readonly Dictionary<String, PhysicsJoint> SOPName_to_pendingJoint = new Dictionary<String, PhysicsJoint>();
264 private readonly DoubleDictionary<Vector3, IntPtr, IntPtr> RegionTerrain = new DoubleDictionary<Vector3, IntPtr, IntPtr>();
265 private readonly Dictionary<IntPtr,float[]> TerrainHeightFieldHeights = new Dictionary<IntPtr, float[]>();
266
267 private d.Contact contact;
268 private d.Contact TerrainContact;
269 private d.Contact AvatarMovementprimContact;
270 private d.Contact AvatarMovementTerrainContact;
271 private d.Contact WaterContact;
272 private d.Contact[,] m_materialContacts;
273
274//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
275//Ckrinke private int m_randomizeWater = 200;
276 private int m_physicsiterations = 10;
277 private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
278 private readonly PhysicsActor PANull = new NullPhysicsActor();
279 private float step_time = 0.0f;
280//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
281//Ckrinke private int ms = 0;
282 public IntPtr world;
283 //private bool returncollisions = false;
284 // private uint obj1LocalID = 0;
285 private uint obj2LocalID = 0;
286 //private int ctype = 0;
287 private OdeCharacter cc1;
288 private OdePrim cp1;
289 private OdeCharacter cc2;
290 private OdePrim cp2;
291 //private int cStartStop = 0;
292 //private string cDictKey = "";
293
294 public IntPtr space;
295
296 //private IntPtr tmpSpace;
297 // split static geometry collision handling into spaces of 30 meters
298 public IntPtr[,] staticPrimspace;
299
300 public Object OdeLock;
301
302 public IMesher mesher;
303
304 private IConfigSource m_config;
305
306 public bool physics_logging = false;
307 public int physics_logging_interval = 0;
308 public bool physics_logging_append_existing_logfile = false;
309
310 public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f);
311 public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f);
312
313 // TODO: unused: private uint heightmapWidth = m_regionWidth + 1;
314 // TODO: unused: private uint heightmapHeight = m_regionHeight + 1;
315 // TODO: unused: private uint heightmapWidthSamples;
316 // TODO: unused: private uint heightmapHeightSamples;
317
318 private volatile int m_global_contactcount = 0;
319
320 private Vector3 m_worldOffset = Vector3.Zero;
321 public Vector2 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
322 private PhysicsScene m_parentScene = null;
323
324 private ODERayCastRequestManager m_rayCastManager;
325
326 /// <summary>
327 /// Initiailizes the scene
328 /// Sets many properties that ODE requires to be stable
329 /// These settings need to be tweaked 'exactly' right or weird stuff happens.
330 /// </summary>
331 public OdeScene(CollisionLocker dode, string sceneIdentifier)
332 {
333 m_log
334 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier);
335
336 OdeLock = new Object();
337 ode = dode;
338 nearCallback = near;
339 triCallback = TriCallback;
340 triArrayCallback = TriArrayCallback;
341 m_rayCastManager = new ODERayCastRequestManager(this);
342 lock (OdeLock)
343 {
344 // Create the world and the first space
345 world = d.WorldCreate();
346 space = d.HashSpaceCreate(IntPtr.Zero);
347
348
349 contactgroup = d.JointGroupCreate(0);
350 //contactgroup
351
352 d.WorldSetAutoDisableFlag(world, false);
353 #if USE_DRAWSTUFF
354
355 Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization));
356 viewthread.Start();
357 #endif
358 }
359
360
361 _watermap = new float[258 * 258];
362
363 // Zero out the prim spaces array (we split our space into smaller spaces so
364 // we can hit test less.
365 }
366
367#if USE_DRAWSTUFF
368 public void startvisualization(object o)
369 {
370 ds.Functions fn;
371 fn.version = ds.VERSION;
372 fn.start = new ds.CallbackFunction(start);
373 fn.step = new ds.CallbackFunction(step);
374 fn.command = new ds.CallbackFunction(command);
375 fn.stop = null;
376 fn.path_to_textures = "./textures";
377 string[] args = new string[0];
378 ds.SimulationLoop(args.Length, args, 352, 288, ref fn);
379 }
380#endif
381
382 // Initialize the mesh plugin
383 public override void Initialise(IMesher meshmerizer, IConfigSource config)
384 {
385 mesher = meshmerizer;
386 m_config = config;
387 // Defaults
388
389 if (Environment.OSVersion.Platform == PlatformID.Unix)
390 {
391 avPIDD = 3200.0f;
392 avPIDP = 1400.0f;
393 avStandupTensor = 2000000f;
394 }
395 else
396 {
397 avPIDD = 2200.0f;
398 avPIDP = 900.0f;
399 avStandupTensor = 550000f;
400 }
401
402 int contactsPerCollision = 80;
403
404 if (m_config != null)
405 {
406 IConfig physicsconfig = m_config.Configs["ODEPhysicsSettings"];
407 if (physicsconfig != null)
408 {
409 gravityx = physicsconfig.GetFloat("world_gravityx", 0f);
410 gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
411 gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
412
413 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
414 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
415
416 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
417 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
418 smallHashspaceHigh = physicsconfig.GetInt("small_hashspace_size_high", 66);
419
420 contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f);
421
422 nmTerrainContactFriction = physicsconfig.GetFloat("nm_terraincontact_friction", 255.0f);
423 nmTerrainContactBounce = physicsconfig.GetFloat("nm_terraincontact_bounce", 0.1f);
424 nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
425
426 mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
427 mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
428 mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
429
430 nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
431 nmAvatarObjectContactBounce = physicsconfig.GetFloat("objectcontact_bounce", 0.2f);
432
433 mAvatarObjectContactFriction = physicsconfig.GetFloat("m_avatarobjectcontact_friction", 75f);
434 mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f);
435
436 ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", 0.020f);
437 m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10);
438
439 avDensity = physicsconfig.GetFloat("av_density", 80f);
440 avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f);
441 avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f);
442 avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f);
443 avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f);
444 avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false);
445
446 contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80);
447
448 geomContactPointsStartthrottle = physicsconfig.GetInt("geom_contactpoints_start_throttling", 3);
449 geomUpdatesPerThrottledUpdate = physicsconfig.GetInt("geom_updates_before_throttled_update", 15);
450 geomCrossingFailuresBeforeOutofbounds = physicsconfig.GetInt("geom_crossing_failures_before_outofbounds", 5);
451 geomRegionFence = physicsconfig.GetInt("region_border_fence", 0);
452
453 geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", 10.000006836f);
454 bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", 20);
455
456 bodyPIDD = physicsconfig.GetFloat("body_pid_derivative", 35f);
457 bodyPIDG = physicsconfig.GetFloat("body_pid_gain", 25f);
458
459 forceSimplePrimMeshing = physicsconfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing);
460 meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
461 meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
462 MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
463 m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
464
465 if (Environment.OSVersion.Platform == PlatformID.Unix)
466 {
467 avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 2200.0f);
468 avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 900.0f);
469 avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 550000f);
470 bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 5f);
471 }
472 else
473 {
474 avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", 2200.0f);
475 avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", 900.0f);
476 avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_win", 550000f);
477 bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_win", 5f);
478 }
479
480 physics_logging = physicsconfig.GetBoolean("physics_logging", false);
481 physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
482 physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
483
484 m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false);
485 minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", 3f);
486 maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", 10000.01f);
487 }
488 }
489
490 contacts = new d.ContactGeom[contactsPerCollision];
491
492 staticPrimspace = new IntPtr[(int)(300 / metersInSpace), (int)(300 / metersInSpace)];
493
494 // Centeral contact friction and bounce
495 // ckrinke 11/10/08 Enabling soft_erp but not soft_cfm until I figure out why
496 // an avatar falls through in Z but not in X or Y when walking on a prim.
497 contact.surface.mode |= d.ContactFlags.SoftERP;
498 contact.surface.mu = nmAvatarObjectContactFriction;
499 contact.surface.bounce = nmAvatarObjectContactBounce;
500 contact.surface.soft_cfm = 0.010f;
501 contact.surface.soft_erp = 0.010f;
502
503 // Terrain contact friction and Bounce
504 // This is the *non* moving version. Use this when an avatar
505 // isn't moving to keep it in place better
506 TerrainContact.surface.mode |= d.ContactFlags.SoftERP;
507 TerrainContact.surface.mu = nmTerrainContactFriction;
508 TerrainContact.surface.bounce = nmTerrainContactBounce;
509 TerrainContact.surface.soft_erp = nmTerrainContactERP;
510
511 WaterContact.surface.mode |= (d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM);
512 WaterContact.surface.mu = 0f; // No friction
513 WaterContact.surface.bounce = 0.0f; // No bounce
514 WaterContact.surface.soft_cfm = 0.010f;
515 WaterContact.surface.soft_erp = 0.010f;
516
517 // Prim contact friction and bounce
518 // THis is the *non* moving version of friction and bounce
519 // Use this when an avatar comes in contact with a prim
520 // and is moving
521 AvatarMovementprimContact.surface.mu = mAvatarObjectContactFriction;
522 AvatarMovementprimContact.surface.bounce = mAvatarObjectContactBounce;
523
524 // Terrain contact friction bounce and various error correcting calculations
525 // Use this when an avatar is in contact with the terrain and moving.
526 AvatarMovementTerrainContact.surface.mode |= d.ContactFlags.SoftERP;
527 AvatarMovementTerrainContact.surface.mu = mTerrainContactFriction;
528 AvatarMovementTerrainContact.surface.bounce = mTerrainContactBounce;
529 AvatarMovementTerrainContact.surface.soft_erp = mTerrainContactERP;
530
531
532 /*
533 <summary></summary>
534 Stone = 0,
535 /// <summary></summary>
536 Metal = 1,
537 /// <summary></summary>
538 Glass = 2,
539 /// <summary></summary>
540 Wood = 3,
541 /// <summary></summary>
542 Flesh = 4,
543 /// <summary></summary>
544 Plastic = 5,
545 /// <summary></summary>
546 Rubber = 6
547 */
548
549 m_materialContacts = new d.Contact[7,2];
550
551 m_materialContacts[(int)Material.Stone, 0] = new d.Contact();
552 m_materialContacts[(int)Material.Stone, 0].surface.mode |= d.ContactFlags.SoftERP;
553 m_materialContacts[(int)Material.Stone, 0].surface.mu = nmAvatarObjectContactFriction;
554 m_materialContacts[(int)Material.Stone, 0].surface.bounce = nmAvatarObjectContactBounce;
555 m_materialContacts[(int)Material.Stone, 0].surface.soft_cfm = 0.010f;
556 m_materialContacts[(int)Material.Stone, 0].surface.soft_erp = 0.010f;
557
558 m_materialContacts[(int)Material.Stone, 1] = new d.Contact();
559 m_materialContacts[(int)Material.Stone, 1].surface.mode |= d.ContactFlags.SoftERP;
560 m_materialContacts[(int)Material.Stone, 1].surface.mu = mAvatarObjectContactFriction;
561 m_materialContacts[(int)Material.Stone, 1].surface.bounce = mAvatarObjectContactBounce;
562 m_materialContacts[(int)Material.Stone, 1].surface.soft_cfm = 0.010f;
563 m_materialContacts[(int)Material.Stone, 1].surface.soft_erp = 0.010f;
564
565 m_materialContacts[(int)Material.Metal, 0] = new d.Contact();
566 m_materialContacts[(int)Material.Metal, 0].surface.mode |= d.ContactFlags.SoftERP;
567 m_materialContacts[(int)Material.Metal, 0].surface.mu = nmAvatarObjectContactFriction;
568 m_materialContacts[(int)Material.Metal, 0].surface.bounce = nmAvatarObjectContactBounce;
569 m_materialContacts[(int)Material.Metal, 0].surface.soft_cfm = 0.010f;
570 m_materialContacts[(int)Material.Metal, 0].surface.soft_erp = 0.010f;
571
572 m_materialContacts[(int)Material.Metal, 1] = new d.Contact();
573 m_materialContacts[(int)Material.Metal, 1].surface.mode |= d.ContactFlags.SoftERP;
574 m_materialContacts[(int)Material.Metal, 1].surface.mu = mAvatarObjectContactFriction;
575 m_materialContacts[(int)Material.Metal, 1].surface.bounce = mAvatarObjectContactBounce;
576 m_materialContacts[(int)Material.Metal, 1].surface.soft_cfm = 0.010f;
577 m_materialContacts[(int)Material.Metal, 1].surface.soft_erp = 0.010f;
578
579 m_materialContacts[(int)Material.Glass, 0] = new d.Contact();
580 m_materialContacts[(int)Material.Glass, 0].surface.mode |= d.ContactFlags.SoftERP;
581 m_materialContacts[(int)Material.Glass, 0].surface.mu = 1f;
582 m_materialContacts[(int)Material.Glass, 0].surface.bounce = 0.5f;
583 m_materialContacts[(int)Material.Glass, 0].surface.soft_cfm = 0.010f;
584 m_materialContacts[(int)Material.Glass, 0].surface.soft_erp = 0.010f;
585
586 /*
587 private float nmAvatarObjectContactFriction = 250f;
588 private float nmAvatarObjectContactBounce = 0.1f;
589
590 private float mAvatarObjectContactFriction = 75f;
591 private float mAvatarObjectContactBounce = 0.1f;
592 */
593 m_materialContacts[(int)Material.Glass, 1] = new d.Contact();
594 m_materialContacts[(int)Material.Glass, 1].surface.mode |= d.ContactFlags.SoftERP;
595 m_materialContacts[(int)Material.Glass, 1].surface.mu = 1f;
596 m_materialContacts[(int)Material.Glass, 1].surface.bounce = 0.5f;
597 m_materialContacts[(int)Material.Glass, 1].surface.soft_cfm = 0.010f;
598 m_materialContacts[(int)Material.Glass, 1].surface.soft_erp = 0.010f;
599
600 m_materialContacts[(int)Material.Wood, 0] = new d.Contact();
601 m_materialContacts[(int)Material.Wood, 0].surface.mode |= d.ContactFlags.SoftERP;
602 m_materialContacts[(int)Material.Wood, 0].surface.mu = nmAvatarObjectContactFriction;
603 m_materialContacts[(int)Material.Wood, 0].surface.bounce = nmAvatarObjectContactBounce;
604 m_materialContacts[(int)Material.Wood, 0].surface.soft_cfm = 0.010f;
605 m_materialContacts[(int)Material.Wood, 0].surface.soft_erp = 0.010f;
606
607 m_materialContacts[(int)Material.Wood, 1] = new d.Contact();
608 m_materialContacts[(int)Material.Wood, 1].surface.mode |= d.ContactFlags.SoftERP;
609 m_materialContacts[(int)Material.Wood, 1].surface.mu = mAvatarObjectContactFriction;
610 m_materialContacts[(int)Material.Wood, 1].surface.bounce = mAvatarObjectContactBounce;
611 m_materialContacts[(int)Material.Wood, 1].surface.soft_cfm = 0.010f;
612 m_materialContacts[(int)Material.Wood, 1].surface.soft_erp = 0.010f;
613
614 m_materialContacts[(int)Material.Flesh, 0] = new d.Contact();
615 m_materialContacts[(int)Material.Flesh, 0].surface.mode |= d.ContactFlags.SoftERP;
616 m_materialContacts[(int)Material.Flesh, 0].surface.mu = nmAvatarObjectContactFriction;
617 m_materialContacts[(int)Material.Flesh, 0].surface.bounce = nmAvatarObjectContactBounce;
618 m_materialContacts[(int)Material.Flesh, 0].surface.soft_cfm = 0.010f;
619 m_materialContacts[(int)Material.Flesh, 0].surface.soft_erp = 0.010f;
620
621 m_materialContacts[(int)Material.Flesh, 1] = new d.Contact();
622 m_materialContacts[(int)Material.Flesh, 1].surface.mode |= d.ContactFlags.SoftERP;
623 m_materialContacts[(int)Material.Flesh, 1].surface.mu = mAvatarObjectContactFriction;
624 m_materialContacts[(int)Material.Flesh, 1].surface.bounce = mAvatarObjectContactBounce;
625 m_materialContacts[(int)Material.Flesh, 1].surface.soft_cfm = 0.010f;
626 m_materialContacts[(int)Material.Flesh, 1].surface.soft_erp = 0.010f;
627
628 m_materialContacts[(int)Material.Plastic, 0] = new d.Contact();
629 m_materialContacts[(int)Material.Plastic, 0].surface.mode |= d.ContactFlags.SoftERP;
630 m_materialContacts[(int)Material.Plastic, 0].surface.mu = nmAvatarObjectContactFriction;
631 m_materialContacts[(int)Material.Plastic, 0].surface.bounce = nmAvatarObjectContactBounce;
632 m_materialContacts[(int)Material.Plastic, 0].surface.soft_cfm = 0.010f;
633 m_materialContacts[(int)Material.Plastic, 0].surface.soft_erp = 0.010f;
634
635 m_materialContacts[(int)Material.Plastic, 1] = new d.Contact();
636 m_materialContacts[(int)Material.Plastic, 1].surface.mode |= d.ContactFlags.SoftERP;
637 m_materialContacts[(int)Material.Plastic, 1].surface.mu = mAvatarObjectContactFriction;
638 m_materialContacts[(int)Material.Plastic, 1].surface.bounce = mAvatarObjectContactBounce;
639 m_materialContacts[(int)Material.Plastic, 1].surface.soft_cfm = 0.010f;
640 m_materialContacts[(int)Material.Plastic, 1].surface.soft_erp = 0.010f;
641
642 m_materialContacts[(int)Material.Rubber, 0] = new d.Contact();
643 m_materialContacts[(int)Material.Rubber, 0].surface.mode |= d.ContactFlags.SoftERP;
644 m_materialContacts[(int)Material.Rubber, 0].surface.mu = nmAvatarObjectContactFriction;
645 m_materialContacts[(int)Material.Rubber, 0].surface.bounce = nmAvatarObjectContactBounce;
646 m_materialContacts[(int)Material.Rubber, 0].surface.soft_cfm = 0.010f;
647 m_materialContacts[(int)Material.Rubber, 0].surface.soft_erp = 0.010f;
648
649 m_materialContacts[(int)Material.Rubber, 1] = new d.Contact();
650 m_materialContacts[(int)Material.Rubber, 1].surface.mode |= d.ContactFlags.SoftERP;
651 m_materialContacts[(int)Material.Rubber, 1].surface.mu = mAvatarObjectContactFriction;
652 m_materialContacts[(int)Material.Rubber, 1].surface.bounce = mAvatarObjectContactBounce;
653 m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.010f;
654 m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.010f;
655
656 d.HashSpaceSetLevels(space, worldHashspaceLow, worldHashspaceHigh);
657
658 // Set the gravity,, don't disable things automatically (we set it explicitly on some things)
659
660 d.WorldSetGravity(world, gravityx, gravityy, gravityz);
661 d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
662
663 d.WorldSetLinearDamping(world, 256f);
664 d.WorldSetAngularDamping(world, 256f);
665 d.WorldSetAngularDampingThreshold(world, 256f);
666 d.WorldSetLinearDampingThreshold(world, 256f);
667 d.WorldSetMaxAngularSpeed(world, 256f);
668
669 // Set how many steps we go without running collision testing
670 // This is in addition to the step size.
671 // Essentially Steps * m_physicsiterations
672 d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
673 //d.WorldSetContactMaxCorrectingVel(world, 1000.0f);
674
675
676
677 for (int i = 0; i < staticPrimspace.GetLength(0); i++)
678 {
679 for (int j = 0; j < staticPrimspace.GetLength(1); j++)
680 {
681 staticPrimspace[i, j] = IntPtr.Zero;
682 }
683 }
684 }
685
686 internal void waitForSpaceUnlock(IntPtr space)
687 {
688 //if (space != IntPtr.Zero)
689 //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
690 }
691
692 /// <summary>
693 /// Debug space message for printing the space that a prim/avatar is in.
694 /// </summary>
695 /// <param name="pos"></param>
696 /// <returns>Returns which split up space the given position is in.</returns>
697 public string whichspaceamIin(Vector3 pos)
698 {
699 return calculateSpaceForGeom(pos).ToString();
700 }
701
702 #region Collision Detection
703
704 /// <summary>
705 /// This is our near callback. A geometry is near a body
706 /// </summary>
707 /// <param name="space">The space that contains the geoms. Remember, spaces are also geoms</param>
708 /// <param name="g1">a geometry or space</param>
709 /// <param name="g2">another geometry or space</param>
710 private void near(IntPtr space, IntPtr g1, IntPtr g2)
711 {
712 // no lock here! It's invoked from within Simulate(), which is thread-locked
713
714 // Test if we're colliding a geom with a space.
715 // If so we have to drill down into the space recursively
716//Console.WriteLine("near -----------"); //##
717 if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
718 {
719 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
720 return;
721
722 // Separating static prim geometry spaces.
723 // We'll be calling near recursivly if one
724 // of them is a space to find all of the
725 // contact points in the space
726 try
727 {
728 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
729 }
730 catch (AccessViolationException)
731 {
732 m_log.Warn("[PHYSICS]: Unable to collide test a space");
733 return;
734 }
735 //Colliding a space or a geom with a space or a geom. so drill down
736
737 //Collide all geoms in each space..
738 //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback);
739 //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback);
740 return;
741 }
742
743 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
744 return;
745
746 IntPtr b1 = d.GeomGetBody(g1);
747 IntPtr b2 = d.GeomGetBody(g2);
748
749 // d.GeomClassID id = d.GeomGetClass(g1);
750
751 String name1 = null;
752 String name2 = null;
753
754 if (!geom_name_map.TryGetValue(g1, out name1))
755 {
756 name1 = "null";
757 }
758 if (!geom_name_map.TryGetValue(g2, out name2))
759 {
760 name2 = "null";
761 }
762
763 //if (id == d.GeomClassId.TriMeshClass)
764 //{
765 // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2);
766 //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
767 //}
768
769 // Figure out how many contact points we have
770 int count = 0;
771 try
772 {
773 // Colliding Geom To Geom
774 // This portion of the function 'was' blatantly ripped off from BoxStack.cs
775
776 if (g1 == g2)
777 return; // Can't collide with yourself
778
779 if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
780 return;
781
782 lock (contacts)
783 {
784 count = d.Collide(g1, g2, contacts.Length, contacts, d.ContactGeom.SizeOf);
785 if (count > contacts.Length)
786 m_log.Error("[PHYSICS]: Got " + count + " contacts when we asked for a maximum of " + contacts.Length);
787 }
788 }
789 catch (SEHException)
790 {
791 m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
792 ode.drelease(world);
793 base.TriggerPhysicsBasedRestart();
794 }
795 catch (Exception e)
796 {
797 m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
798 return;
799 }
800
801 PhysicsActor p1;
802 PhysicsActor p2;
803
804 if (!actor_name_map.TryGetValue(g1, out p1))
805 {
806 p1 = PANull;
807 }
808
809 if (!actor_name_map.TryGetValue(g2, out p2))
810 {
811 p2 = PANull;
812 }
813
814 ContactPoint maxDepthContact = new ContactPoint();
815 if (p1.CollisionScore + count >= float.MaxValue)
816 p1.CollisionScore = 0;
817 p1.CollisionScore += count;
818
819 if (p2.CollisionScore + count >= float.MaxValue)
820 p2.CollisionScore = 0;
821 p2.CollisionScore += count;
822
823 for (int i = 0; i < count; i++)
824 {
825 d.ContactGeom curContact = contacts[i];
826
827 if (curContact.depth > maxDepthContact.PenetrationDepth)
828 {
829 maxDepthContact = new ContactPoint(
830 new Vector3(curContact.pos.X, curContact.pos.Y, curContact.pos.Z),
831 new Vector3(curContact.normal.X, curContact.normal.Y, curContact.normal.Z),
832 curContact.depth
833 );
834 }
835
836 //m_log.Warn("[CCOUNT]: " + count);
837 IntPtr joint;
838 // If we're colliding with terrain, use 'TerrainContact' instead of contact.
839 // allows us to have different settings
840
841 // We only need to test p2 for 'jump crouch purposes'
842 if (p2 is OdeCharacter && p1.PhysicsActorType == (int)ActorTypes.Prim)
843 {
844 // Testing if the collision is at the feet of the avatar
845
846 //m_log.DebugFormat("[PHYSICS]: {0} - {1} - {2} - {3}", curContact.pos.Z, p2.Position.Z, (p2.Position.Z - curContact.pos.Z), (p2.Size.Z * 0.6f));
847//#@ if ((p2.Position.Z - curContact.pos.Z) > (p2.Size.Z * 0.6f))
848//#@ p2.IsColliding = true;
849 if ((p2.Position.Z - curContact.pos.Z) > (p2.Size.Z * 0.6f)){ //##
850//Console.WriteLine("AvColl 1 {0} - {1} - {2} - {3}", //##
851// curContact.pos.Z, p2.Position.Z, (p2.Position.Z - curContact.pos.Z), (p2.Size.Z * 0.6f)); //##
852 p2.IsColliding = true; //##
853 }else{
854//Console.WriteLine("AvColl 2 {0} - {1} - {2} - {3}", //##
855// curContact.pos.Z, p2.Position.Z, (p2.Position.Z - curContact.pos.Z), (p2.Size.Z * 0.6f)); //##
856
857 } //##
858 }
859 else
860 {
861//Console.WriteLine("AvColl 3 {0}", p2.PhysicsActorType); //##
862 p2.IsColliding = true;
863 }
864
865 //if ((framecount % m_returncollisions) == 0)
866
867 switch (p1.PhysicsActorType)
868 {
869 case (int)ActorTypes.Agent:
870 p2.CollidingObj = true;
871 break;
872 case (int)ActorTypes.Prim:
873 if (p2.Velocity.LengthSquared() > 0.0f)
874 p2.CollidingObj = true;
875 break;
876 case (int)ActorTypes.Unknown:
877 p2.CollidingGround = true;
878 break;
879 default:
880 p2.CollidingGround = true;
881 break;
882 }
883
884 // we don't want prim or avatar to explode
885
886 #region InterPenetration Handling - Unintended physics explosions
887# region disabled code1
888
889 if (curContact.depth >= 0.08f)
890 {
891 //This is disabled at the moment only because it needs more tweaking
892 //It will eventually be uncommented
893 /*
894 if (contact.depth >= 1.00f)
895 {
896 //m_log.Debug("[PHYSICS]: " + contact.depth.ToString());
897 }
898
899 //If you interpenetrate a prim with an agent
900 if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
901 p1.PhysicsActorType == (int) ActorTypes.Prim) ||
902 (p1.PhysicsActorType == (int) ActorTypes.Agent &&
903 p2.PhysicsActorType == (int) ActorTypes.Prim))
904 {
905
906 //contact.depth = contact.depth * 4.15f;
907 /*
908 if (p2.PhysicsActorType == (int) ActorTypes.Agent)
909 {
910 p2.CollidingObj = true;
911 contact.depth = 0.003f;
912 p2.Velocity = p2.Velocity + new PhysicsVector(0, 0, 2.5f);
913 OdeCharacter character = (OdeCharacter) p2;
914 character.SetPidStatus(true);
915 contact.pos = new d.Vector3(contact.pos.X + (p1.Size.X / 2), contact.pos.Y + (p1.Size.Y / 2), contact.pos.Z + (p1.Size.Z / 2));
916
917 }
918 else
919 {
920
921 //contact.depth = 0.0000000f;
922 }
923 if (p1.PhysicsActorType == (int) ActorTypes.Agent)
924 {
925
926 p1.CollidingObj = true;
927 contact.depth = 0.003f;
928 p1.Velocity = p1.Velocity + new PhysicsVector(0, 0, 2.5f);
929 contact.pos = new d.Vector3(contact.pos.X + (p2.Size.X / 2), contact.pos.Y + (p2.Size.Y / 2), contact.pos.Z + (p2.Size.Z / 2));
930 OdeCharacter character = (OdeCharacter)p1;
931 character.SetPidStatus(true);
932 }
933 else
934 {
935
936 //contact.depth = 0.0000000f;
937 }
938
939
940
941 }
942*/
943 // If you interpenetrate a prim with another prim
944 /*
945 if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim)
946 {
947 #region disabledcode2
948 //OdePrim op1 = (OdePrim)p1;
949 //OdePrim op2 = (OdePrim)p2;
950 //op1.m_collisionscore++;
951 //op2.m_collisionscore++;
952
953 //if (op1.m_collisionscore > 8000 || op2.m_collisionscore > 8000)
954 //{
955 //op1.m_taintdisable = true;
956 //AddPhysicsActorTaint(p1);
957 //op2.m_taintdisable = true;
958 //AddPhysicsActorTaint(p2);
959 //}
960
961 //if (contact.depth >= 0.25f)
962 //{
963 // Don't collide, one or both prim will expld.
964
965 //op1.m_interpenetrationcount++;
966 //op2.m_interpenetrationcount++;
967 //interpenetrations_before_disable = 200;
968 //if (op1.m_interpenetrationcount >= interpenetrations_before_disable)
969 //{
970 //op1.m_taintdisable = true;
971 //AddPhysicsActorTaint(p1);
972 //}
973 //if (op2.m_interpenetrationcount >= interpenetrations_before_disable)
974 //{
975 // op2.m_taintdisable = true;
976 //AddPhysicsActorTaint(p2);
977 //}
978
979 //contact.depth = contact.depth / 8f;
980 //contact.normal = new d.Vector3(0, 0, 1);
981 //}
982 //if (op1.m_disabled || op2.m_disabled)
983 //{
984 //Manually disabled objects stay disabled
985 //contact.depth = 0f;
986 //}
987 #endregion
988 }
989 */
990#endregion
991 if (curContact.depth >= 1.00f)
992 {
993 //m_log.Info("[P]: " + contact.depth.ToString());
994 if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
995 p1.PhysicsActorType == (int) ActorTypes.Unknown) ||
996 (p1.PhysicsActorType == (int) ActorTypes.Agent &&
997 p2.PhysicsActorType == (int) ActorTypes.Unknown))
998 {
999 if (p2.PhysicsActorType == (int) ActorTypes.Agent)
1000 {
1001 if (p2 is OdeCharacter)
1002 {
1003 OdeCharacter character = (OdeCharacter) p2;
1004
1005 //p2.CollidingObj = true;
1006 curContact.depth = 0.00000003f;
1007 p2.Velocity = p2.Velocity + new Vector3(0f, 0f, 0.5f);
1008 curContact.pos =
1009 new d.Vector3(curContact.pos.X + (p1.Size.X/2),
1010 curContact.pos.Y + (p1.Size.Y/2),
1011 curContact.pos.Z + (p1.Size.Z/2));
1012 character.SetPidStatus(true);
1013 }
1014 }
1015
1016
1017 if (p1.PhysicsActorType == (int) ActorTypes.Agent)
1018 {
1019 if (p1 is OdeCharacter)
1020 {
1021 OdeCharacter character = (OdeCharacter) p1;
1022
1023 //p2.CollidingObj = true;
1024 curContact.depth = 0.00000003f;
1025 p1.Velocity = p1.Velocity + new Vector3(0f, 0f, 0.5f);
1026 curContact.pos =
1027 new d.Vector3(curContact.pos.X + (p1.Size.X/2),
1028 curContact.pos.Y + (p1.Size.Y/2),
1029 curContact.pos.Z + (p1.Size.Z/2));
1030 character.SetPidStatus(true);
1031 }
1032 }
1033 }
1034 }
1035 }
1036
1037 #endregion
1038
1039 // Logic for collision handling
1040 // Note, that if *all* contacts are skipped (VolumeDetect)
1041 // The prim still detects (and forwards) collision events but
1042 // appears to be phantom for the world
1043 Boolean skipThisContact = false;
1044
1045 if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect))
1046 skipThisContact = true; // No collision on volume detect prims
1047
1048 if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect))
1049 skipThisContact = true; // No collision on volume detect prims
1050
1051 if (!skipThisContact && curContact.depth < 0f)
1052 skipThisContact = true;
1053
1054 if (!skipThisContact && checkDupe(curContact, p2.PhysicsActorType))
1055 skipThisContact = true;
1056
1057 const int maxContactsbeforedeath = 4000;
1058 joint = IntPtr.Zero;
1059
1060 if (!skipThisContact)
1061 {
1062 // If we're colliding against terrain
1063 if (name1 == "Terrain" || name2 == "Terrain")
1064 {
1065 // If we're moving
1066 if ((p2.PhysicsActorType == (int) ActorTypes.Agent) &&
1067 (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f))
1068 {
1069 // Use the movement terrain contact
1070 AvatarMovementTerrainContact.geom = curContact;
1071 _perloopContact.Add(curContact);
1072 if (m_global_contactcount < maxContactsbeforedeath)
1073 {
1074 joint = d.JointCreateContact(world, contactgroup, ref AvatarMovementTerrainContact);
1075 m_global_contactcount++;
1076 }
1077 }
1078 else
1079 {
1080 if (p2.PhysicsActorType == (int)ActorTypes.Agent)
1081 {
1082 // Use the non moving terrain contact
1083 TerrainContact.geom = curContact;
1084 _perloopContact.Add(curContact);
1085 if (m_global_contactcount < maxContactsbeforedeath)
1086 {
1087 joint = d.JointCreateContact(world, contactgroup, ref TerrainContact);
1088 m_global_contactcount++;
1089 }
1090 }
1091 else
1092 {
1093 if (p2.PhysicsActorType == (int)ActorTypes.Prim && p1.PhysicsActorType == (int)ActorTypes.Prim)
1094 {
1095 // prim prim contact
1096 // int pj294950 = 0;
1097 int movintYN = 0;
1098 int material = (int) Material.Wood;
1099 // prim terrain contact
1100 if (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f)
1101 {
1102 movintYN = 1;
1103 }
1104
1105 if (p2 is OdePrim)
1106 material = ((OdePrim)p2).m_material;
1107
1108 //m_log.DebugFormat("Material: {0}", material);
1109 m_materialContacts[material, movintYN].geom = curContact;
1110 _perloopContact.Add(curContact);
1111
1112 if (m_global_contactcount < maxContactsbeforedeath)
1113 {
1114 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
1115 m_global_contactcount++;
1116
1117 }
1118
1119 }
1120 else
1121 {
1122
1123 int movintYN = 0;
1124 // prim terrain contact
1125 if (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f)
1126 {
1127 movintYN = 1;
1128 }
1129
1130 int material = (int)Material.Wood;
1131
1132 if (p2 is OdePrim)
1133 material = ((OdePrim)p2).m_material;
1134 //m_log.DebugFormat("Material: {0}", material);
1135 m_materialContacts[material, movintYN].geom = curContact;
1136 _perloopContact.Add(curContact);
1137
1138 if (m_global_contactcount < maxContactsbeforedeath)
1139 {
1140 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
1141 m_global_contactcount++;
1142
1143 }
1144 }
1145 }
1146 }
1147 //if (p2.PhysicsActorType == (int)ActorTypes.Prim)
1148 //{
1149 //m_log.Debug("[PHYSICS]: prim contacting with ground");
1150 //}
1151 }
1152 else if (name1 == "Water" || name2 == "Water")
1153 {
1154 /*
1155 if ((p2.PhysicsActorType == (int) ActorTypes.Prim))
1156 {
1157 }
1158 else
1159 {
1160 }
1161 */
1162 //WaterContact.surface.soft_cfm = 0.0000f;
1163 //WaterContact.surface.soft_erp = 0.00000f;
1164 if (curContact.depth > 0.1f)
1165 {
1166 curContact.depth *= 52;
1167 //contact.normal = new d.Vector3(0, 0, 1);
1168 //contact.pos = new d.Vector3(0, 0, contact.pos.Z - 5f);
1169 }
1170 WaterContact.geom = curContact;
1171 _perloopContact.Add(curContact);
1172 if (m_global_contactcount < maxContactsbeforedeath)
1173 {
1174 joint = d.JointCreateContact(world, contactgroup, ref WaterContact);
1175 m_global_contactcount++;
1176 }
1177 //m_log.Info("[PHYSICS]: Prim Water Contact" + contact.depth);
1178 }
1179 else
1180 {
1181 // we're colliding with prim or avatar
1182 // check if we're moving
1183 if ((p2.PhysicsActorType == (int)ActorTypes.Agent))
1184 {
1185 if ((Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f))
1186 {
1187 // Use the Movement prim contact
1188 AvatarMovementprimContact.geom = curContact;
1189 _perloopContact.Add(curContact);
1190 if (m_global_contactcount < maxContactsbeforedeath)
1191 {
1192 joint = d.JointCreateContact(world, contactgroup, ref AvatarMovementprimContact);
1193 m_global_contactcount++;
1194 }
1195 }
1196 else
1197 {
1198 // Use the non movement contact
1199 contact.geom = curContact;
1200 _perloopContact.Add(curContact);
1201
1202 if (m_global_contactcount < maxContactsbeforedeath)
1203 {
1204 joint = d.JointCreateContact(world, contactgroup, ref contact);
1205 m_global_contactcount++;
1206 }
1207 }
1208 }
1209 else if (p2.PhysicsActorType == (int)ActorTypes.Prim)
1210 {
1211 //p1.PhysicsActorType
1212 int material = (int)Material.Wood;
1213
1214 if (p2 is OdePrim)
1215 material = ((OdePrim)p2).m_material;
1216
1217 //m_log.DebugFormat("Material: {0}", material);
1218 m_materialContacts[material, 0].geom = curContact;
1219 _perloopContact.Add(curContact);
1220
1221 if (m_global_contactcount < maxContactsbeforedeath)
1222 {
1223 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, 0]);
1224 m_global_contactcount++;
1225
1226 }
1227 }
1228 }
1229
1230 if (m_global_contactcount < maxContactsbeforedeath && joint != IntPtr.Zero) // stack collide!
1231 {
1232 d.JointAttach(joint, b1, b2);
1233 m_global_contactcount++;
1234 }
1235
1236 }
1237 collision_accounting_events(p1, p2, maxDepthContact);
1238 if (count > geomContactPointsStartthrottle)
1239 {
1240 // If there are more then 3 contact points, it's likely
1241 // that we've got a pile of objects, so ...
1242 // We don't want to send out hundreds of terse updates over and over again
1243 // so lets throttle them and send them again after it's somewhat sorted out.
1244 p2.ThrottleUpdates = true;
1245 }
1246 //m_log.Debug(count.ToString());
1247 //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
1248 }
1249 }
1250
1251 private bool checkDupe(d.ContactGeom contactGeom, int atype)
1252 {
1253 bool result = false;
1254 //return result;
1255 if (!m_filterCollisions)
1256 return false;
1257
1258 ActorTypes at = (ActorTypes)atype;
1259 lock (_perloopContact)
1260 {
1261 foreach (d.ContactGeom contact in _perloopContact)
1262 {
1263 //if ((contact.g1 == contactGeom.g1 && contact.g2 == contactGeom.g2))
1264 //{
1265 // || (contact.g2 == contactGeom.g1 && contact.g1 == contactGeom.g2)
1266 if (at == ActorTypes.Agent)
1267 {
1268 if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)) && contactGeom.g1 != LandGeom && contactGeom.g2 != LandGeom)
1269 {
1270
1271 if (Math.Abs(contact.depth - contactGeom.depth) < 0.052f)
1272 {
1273 //contactGeom.depth *= .00005f;
1274 //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
1275 // m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
1276 result = true;
1277 break;
1278 }
1279 else
1280 {
1281 //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
1282 }
1283 }
1284 else
1285 {
1286 //m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
1287 //int i = 0;
1288 }
1289 }
1290 else if (at == ActorTypes.Prim)
1291 {
1292 //d.AABB aabb1 = new d.AABB();
1293 //d.AABB aabb2 = new d.AABB();
1294
1295 //d.GeomGetAABB(contactGeom.g2, out aabb2);
1296 //d.GeomGetAABB(contactGeom.g1, out aabb1);
1297 //aabb1.
1298 if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)) && contactGeom.g1 != LandGeom && contactGeom.g2 != LandGeom)
1299 {
1300 if (contactGeom.normal.X == contact.normal.X && contactGeom.normal.Y == contact.normal.Y && contactGeom.normal.Z == contact.normal.Z)
1301 {
1302 if (Math.Abs(contact.depth - contactGeom.depth) < 0.272f)
1303 {
1304 result = true;
1305 break;
1306 }
1307 }
1308 //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
1309 //m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
1310 }
1311
1312 }
1313
1314 //}
1315
1316 }
1317 }
1318 return result;
1319 }
1320
1321 private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, ContactPoint contact)
1322 {
1323 // obj1LocalID = 0;
1324 //returncollisions = false;
1325 obj2LocalID = 0;
1326 //ctype = 0;
1327 //cStartStop = 0;
1328 if (!p2.SubscribedEvents() && !p1.SubscribedEvents())
1329 return;
1330
1331 switch ((ActorTypes)p2.PhysicsActorType)
1332 {
1333 case ActorTypes.Agent:
1334 cc2 = (OdeCharacter)p2;
1335
1336 // obj1LocalID = cc2.m_localID;
1337 switch ((ActorTypes)p1.PhysicsActorType)
1338 {
1339 case ActorTypes.Agent:
1340 cc1 = (OdeCharacter)p1;
1341 obj2LocalID = cc1.m_localID;
1342 cc1.AddCollisionEvent(cc2.m_localID, contact);
1343 //ctype = (int)CollisionCategories.Character;
1344
1345 //if (cc1.CollidingObj)
1346 //cStartStop = (int)StatusIndicators.Generic;
1347 //else
1348 //cStartStop = (int)StatusIndicators.Start;
1349
1350 //returncollisions = true;
1351 break;
1352 case ActorTypes.Prim:
1353 if (p1 is OdePrim)
1354 {
1355 cp1 = (OdePrim) p1;
1356 obj2LocalID = cp1.m_localID;
1357 cp1.AddCollisionEvent(cc2.m_localID, contact);
1358 }
1359 //ctype = (int)CollisionCategories.Geom;
1360
1361 //if (cp1.CollidingObj)
1362 //cStartStop = (int)StatusIndicators.Generic;
1363 //else
1364 //cStartStop = (int)StatusIndicators.Start;
1365
1366 //returncollisions = true;
1367 break;
1368
1369 case ActorTypes.Ground:
1370 case ActorTypes.Unknown:
1371 obj2LocalID = 0;
1372 //ctype = (int)CollisionCategories.Land;
1373 //returncollisions = true;
1374 break;
1375 }
1376
1377 cc2.AddCollisionEvent(obj2LocalID, contact);
1378 break;
1379 case ActorTypes.Prim:
1380
1381 if (p2 is OdePrim)
1382 {
1383 cp2 = (OdePrim) p2;
1384
1385 // obj1LocalID = cp2.m_localID;
1386 switch ((ActorTypes) p1.PhysicsActorType)
1387 {
1388 case ActorTypes.Agent:
1389 if (p1 is OdeCharacter)
1390 {
1391 cc1 = (OdeCharacter) p1;
1392 obj2LocalID = cc1.m_localID;
1393 cc1.AddCollisionEvent(cp2.m_localID, contact);
1394 //ctype = (int)CollisionCategories.Character;
1395
1396 //if (cc1.CollidingObj)
1397 //cStartStop = (int)StatusIndicators.Generic;
1398 //else
1399 //cStartStop = (int)StatusIndicators.Start;
1400 //returncollisions = true;
1401 }
1402 break;
1403 case ActorTypes.Prim:
1404
1405 if (p1 is OdePrim)
1406 {
1407 cp1 = (OdePrim) p1;
1408 obj2LocalID = cp1.m_localID;
1409 cp1.AddCollisionEvent(cp2.m_localID, contact);
1410 //ctype = (int)CollisionCategories.Geom;
1411
1412 //if (cp1.CollidingObj)
1413 //cStartStop = (int)StatusIndicators.Generic;
1414 //else
1415 //cStartStop = (int)StatusIndicators.Start;
1416
1417 //returncollisions = true;
1418 }
1419 break;
1420
1421 case ActorTypes.Ground:
1422 case ActorTypes.Unknown:
1423 obj2LocalID = 0;
1424 //ctype = (int)CollisionCategories.Land;
1425
1426 //returncollisions = true;
1427 break;
1428 }
1429
1430 cp2.AddCollisionEvent(obj2LocalID, contact);
1431 }
1432 break;
1433 }
1434 //if (returncollisions)
1435 //{
1436
1437 //lock (m_storedCollisions)
1438 //{
1439 //cDictKey = obj1LocalID.ToString() + obj2LocalID.ToString() + cStartStop.ToString() + ctype.ToString();
1440 //if (m_storedCollisions.ContainsKey(cDictKey))
1441 //{
1442 //sCollisionData objd = m_storedCollisions[cDictKey];
1443 //objd.NumberOfCollisions += 1;
1444 //objd.lastframe = framecount;
1445 //m_storedCollisions[cDictKey] = objd;
1446 //}
1447 //else
1448 //{
1449 //sCollisionData objd = new sCollisionData();
1450 //objd.ColliderLocalId = obj1LocalID;
1451 //objd.CollidedWithLocalId = obj2LocalID;
1452 //objd.CollisionType = ctype;
1453 //objd.NumberOfCollisions = 1;
1454 //objd.lastframe = framecount;
1455 //objd.StatusIndicator = cStartStop;
1456 //m_storedCollisions.Add(cDictKey, objd);
1457 //}
1458 //}
1459 // }
1460 }
1461
1462 public int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount)
1463 {
1464 /* String name1 = null;
1465 String name2 = null;
1466
1467 if (!geom_name_map.TryGetValue(trimesh, out name1))
1468 {
1469 name1 = "null";
1470 }
1471 if (!geom_name_map.TryGetValue(refObject, out name2))
1472 {
1473 name2 = "null";
1474 }
1475
1476 m_log.InfoFormat("TriArrayCallback: A collision was detected between {1} and {2}", 0, name1, name2);
1477 */
1478 return 1;
1479 }
1480
1481 public int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex)
1482 {
1483 String name1 = null;
1484 String name2 = null;
1485
1486 if (!geom_name_map.TryGetValue(trimesh, out name1))
1487 {
1488 name1 = "null";
1489 }
1490
1491 if (!geom_name_map.TryGetValue(refObject, out name2))
1492 {
1493 name2 = "null";
1494 }
1495
1496 // m_log.InfoFormat("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex);
1497
1498 d.Vector3 v0 = new d.Vector3();
1499 d.Vector3 v1 = new d.Vector3();
1500 d.Vector3 v2 = new d.Vector3();
1501
1502 d.GeomTriMeshGetTriangle(trimesh, 0, ref v0, ref v1, ref v2);
1503 // m_log.DebugFormat("Triangle {0} is <{1},{2},{3}>, <{4},{5},{6}>, <{7},{8},{9}>", triangleIndex, v0.X, v0.Y, v0.Z, v1.X, v1.Y, v1.Z, v2.X, v2.Y, v2.Z);
1504
1505 return 1;
1506 }
1507
1508 /// <summary>
1509 /// This is our collision testing routine in ODE
1510 /// </summary>
1511 /// <param name="timeStep"></param>
1512 private void collision_optimized(float timeStep)
1513 {
1514 _perloopContact.Clear();
1515
1516 lock (_characters)
1517 {
1518 foreach (OdeCharacter chr in _characters)
1519 {
1520 // Reset the collision values to false
1521 // since we don't know if we're colliding yet
1522
1523 // For some reason this can happen. Don't ask...
1524 //
1525 if (chr == null)
1526 continue;
1527
1528 if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
1529 continue;
1530
1531 chr.IsColliding = false;
1532 chr.CollidingGround = false;
1533 chr.CollidingObj = false;
1534
1535 // test the avatar's geometry for collision with the space
1536 // This will return near and the space that they are the closest to
1537 // And we'll run this again against the avatar and the space segment
1538 // This will return with a bunch of possible objects in the space segment
1539 // and we'll run it again on all of them.
1540 try
1541 {
1542 d.SpaceCollide2(space, chr.Shell, IntPtr.Zero, nearCallback);
1543 }
1544 catch (AccessViolationException)
1545 {
1546 m_log.Warn("[PHYSICS]: Unable to space collide");
1547 }
1548 //float terrainheight = GetTerrainHeightAtXY(chr.Position.X, chr.Position.Y);
1549 //if (chr.Position.Z + (chr.Velocity.Z * timeStep) < terrainheight + 10)
1550 //{
1551 //chr.Position.Z = terrainheight + 10.0f;
1552 //forcedZ = true;
1553 //}
1554 }
1555 }
1556
1557 lock (_activeprims)
1558 {
1559 List<OdePrim> removeprims = null;
1560 foreach (OdePrim chr in _activeprims)
1561 {
1562 if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled))
1563 {
1564 try
1565 {
1566 lock (chr)
1567 {
1568 if (space != IntPtr.Zero && chr.prim_geom != IntPtr.Zero && chr.m_taintremove == false)
1569 {
1570 d.SpaceCollide2(space, chr.prim_geom, IntPtr.Zero, nearCallback);
1571 }
1572 else
1573 {
1574 if (removeprims == null)
1575 {
1576 removeprims = new List<OdePrim>();
1577 }
1578 removeprims.Add(chr);
1579 m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed. Removed it from the active prim list. This needs to be fixed!");
1580 }
1581 }
1582 }
1583 catch (AccessViolationException)
1584 {
1585 m_log.Warn("[PHYSICS]: Unable to space collide");
1586 }
1587 }
1588 }
1589 if (removeprims != null)
1590 {
1591 foreach (OdePrim chr in removeprims)
1592 {
1593 _activeprims.Remove(chr);
1594 }
1595 }
1596 }
1597
1598 _perloopContact.Clear();
1599 }
1600
1601 #endregion
1602
1603 public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
1604 {
1605 m_worldOffset = offset;
1606 WorldExtents = new Vector2(extents.X, extents.Y);
1607 m_parentScene = pScene;
1608
1609 }
1610
1611 // Recovered for use by fly height. Kitto Flora
1612 public float GetTerrainHeightAtXY(float x, float y)
1613 {
1614
1615 int offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
1616 int offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
1617
1618 IntPtr heightFieldGeom = IntPtr.Zero;
1619
1620 if (RegionTerrain.TryGetValue(new Vector3(offsetX,offsetY,0), out heightFieldGeom))
1621 {
1622 if (heightFieldGeom != IntPtr.Zero)
1623 {
1624 if (TerrainHeightFieldHeights.ContainsKey(heightFieldGeom))
1625 {
1626
1627 int index;
1628
1629
1630 if ((int)x > WorldExtents.X || (int)y > WorldExtents.Y ||
1631 (int)x < 0.001f || (int)y < 0.001f)
1632 return 0;
1633
1634 x = x - offsetX;
1635 y = y - offsetY;
1636
1637 index = (int)((int)x * ((int)Constants.RegionSize + 2) + (int)y);
1638
1639 if (index < TerrainHeightFieldHeights[heightFieldGeom].Length)
1640 {
1641 //m_log.DebugFormat("x{0} y{1} = {2}", x, y, (float)TerrainHeightFieldHeights[heightFieldGeom][index]);
1642 return (float)TerrainHeightFieldHeights[heightFieldGeom][index];
1643 }
1644
1645 else
1646 return 0f;
1647 }
1648 else
1649 {
1650 return 0f;
1651 }
1652
1653 }
1654 else
1655 {
1656 return 0f;
1657 }
1658
1659 }
1660 else
1661 {
1662 return 0f;
1663 }
1664
1665
1666 }
1667// End recovered. Kitto Flora
1668
1669 public void addCollisionEventReporting(PhysicsActor obj)
1670 {
1671 lock (_collisionEventPrim)
1672 {
1673 if (!_collisionEventPrim.Contains(obj))
1674 _collisionEventPrim.Add(obj);
1675 }
1676 }
1677
1678 public void remCollisionEventReporting(PhysicsActor obj)
1679 {
1680 lock (_collisionEventPrim)
1681 {
1682 if (!_collisionEventPrim.Contains(obj))
1683 _collisionEventPrim.Remove(obj);
1684 }
1685 }
1686
1687 #region Add/Remove Entities
1688
1689 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
1690 {
1691 Vector3 pos;
1692 pos.X = position.X;
1693 pos.Y = position.Y;
1694 pos.Z = position.Z;
1695 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size, avPIDD, avPIDP, avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, avMovementDivisorWalk, avMovementDivisorRun);
1696 newAv.Flying = isFlying;
1697 newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
1698
1699 return newAv;
1700 }
1701
1702 public void AddCharacter(OdeCharacter chr)
1703 {
1704 lock (_characters)
1705 {
1706 if (!_characters.Contains(chr))
1707 {
1708 _characters.Add(chr);
1709 if (chr.bad)
1710 m_log.DebugFormat("[PHYSICS] Added BAD actor {0} to characters list", chr.m_uuid);
1711 }
1712 }
1713 }
1714
1715 public void RemoveCharacter(OdeCharacter chr)
1716 {
1717 lock (_characters)
1718 {
1719 if (_characters.Contains(chr))
1720 {
1721 _characters.Remove(chr);
1722 }
1723 }
1724 }
1725 public void BadCharacter(OdeCharacter chr)
1726 {
1727 lock (_badCharacter)
1728 {
1729 if (!_badCharacter.Contains(chr))
1730 _badCharacter.Add(chr);
1731 }
1732 }
1733
1734 public override void RemoveAvatar(PhysicsActor actor)
1735 {
1736 //m_log.Debug("[PHYSICS]:ODELOCK");
1737 ((OdeCharacter) actor).Destroy();
1738
1739 }
1740
1741 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,
1742 IMesh mesh, PrimitiveBaseShape pbs, bool isphysical)
1743 {
1744
1745 Vector3 pos = position;
1746 Vector3 siz = size;
1747 Quaternion rot = rotation;
1748
1749 OdePrim newPrim;
1750 lock (OdeLock)
1751 {
1752 newPrim = new OdePrim(name, this, pos, siz, rot, mesh, pbs, isphysical, ode);
1753
1754 lock (_prims)
1755 _prims.Add(newPrim);
1756 }
1757
1758 return newPrim;
1759 }
1760
1761 public void addActivePrim(OdePrim activatePrim)
1762 {
1763 // adds active prim.. (ones that should be iterated over in collisions_optimized
1764 lock (_activeprims)
1765 {
1766 if (!_activeprims.Contains(activatePrim))
1767 _activeprims.Add(activatePrim);
1768 //else
1769 // m_log.Warn("[PHYSICS]: Double Entry in _activeprims detected, potential crash immenent");
1770 }
1771 }
1772
1773 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1774 Vector3 size, Quaternion rotation) //To be removed
1775 {
1776 return AddPrimShape(primName, pbs, position, size, rotation, false);
1777 }
1778
1779 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1780 Vector3 size, Quaternion rotation, bool isPhysical)
1781 {
1782 PhysicsActor result;
1783 IMesh mesh = null;
1784
1785 if (needsMeshing(pbs))
1786 mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
1787
1788 result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);
1789
1790 return result;
1791 }
1792
1793 public override float TimeDilation
1794 {
1795 get { return m_timeDilation; }
1796 }
1797
1798 public override bool SupportsNINJAJoints
1799 {
1800 get { return m_NINJA_physics_joints_enabled; }
1801 }
1802
1803 // internal utility function: must be called within a lock (OdeLock)
1804 private void InternalAddActiveJoint(PhysicsJoint joint)
1805 {
1806 activeJoints.Add(joint);
1807 SOPName_to_activeJoint.Add(joint.ObjectNameInScene, joint);
1808 }
1809
1810 // internal utility function: must be called within a lock (OdeLock)
1811 private void InternalAddPendingJoint(OdePhysicsJoint joint)
1812 {
1813 pendingJoints.Add(joint);
1814 SOPName_to_pendingJoint.Add(joint.ObjectNameInScene, joint);
1815 }
1816
1817 // internal utility function: must be called within a lock (OdeLock)
1818 private void InternalRemovePendingJoint(PhysicsJoint joint)
1819 {
1820 pendingJoints.Remove(joint);
1821 SOPName_to_pendingJoint.Remove(joint.ObjectNameInScene);
1822 }
1823
1824 // internal utility function: must be called within a lock (OdeLock)
1825 private void InternalRemoveActiveJoint(PhysicsJoint joint)
1826 {
1827 activeJoints.Remove(joint);
1828 SOPName_to_activeJoint.Remove(joint.ObjectNameInScene);
1829 }
1830
1831 public override void DumpJointInfo()
1832 {
1833 string hdr = "[NINJA] JOINTINFO: ";
1834 foreach (PhysicsJoint j in pendingJoints)
1835 {
1836 m_log.Debug(hdr + " pending joint, Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
1837 }
1838 m_log.Debug(hdr + pendingJoints.Count + " total pending joints");
1839 foreach (string jointName in SOPName_to_pendingJoint.Keys)
1840 {
1841 m_log.Debug(hdr + " pending joints dict contains Name: " + jointName);
1842 }
1843 m_log.Debug(hdr + SOPName_to_pendingJoint.Keys.Count + " total pending joints dict entries");
1844 foreach (PhysicsJoint j in activeJoints)
1845 {
1846 m_log.Debug(hdr + " active joint, Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
1847 }
1848 m_log.Debug(hdr + activeJoints.Count + " total active joints");
1849 foreach (string jointName in SOPName_to_activeJoint.Keys)
1850 {
1851 m_log.Debug(hdr + " active joints dict contains Name: " + jointName);
1852 }
1853 m_log.Debug(hdr + SOPName_to_activeJoint.Keys.Count + " total active joints dict entries");
1854
1855 m_log.Debug(hdr + " Per-body joint connectivity information follows.");
1856 m_log.Debug(hdr + joints_connecting_actor.Keys.Count + " bodies are connected by joints.");
1857 foreach (string actorName in joints_connecting_actor.Keys)
1858 {
1859 m_log.Debug(hdr + " Actor " + actorName + " has the following joints connecting it");
1860 foreach (PhysicsJoint j in joints_connecting_actor[actorName])
1861 {
1862 m_log.Debug(hdr + " * joint Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
1863 }
1864 m_log.Debug(hdr + joints_connecting_actor[actorName].Count + " connecting joints total for this actor");
1865 }
1866 }
1867
1868 public override void RequestJointDeletion(string ObjectNameInScene)
1869 {
1870 lock (externalJointRequestsLock)
1871 {
1872 if (!requestedJointsToBeDeleted.Contains(ObjectNameInScene)) // forbid same deletion request from entering twice to prevent spurious deletions processed asynchronously
1873 {
1874 requestedJointsToBeDeleted.Add(ObjectNameInScene);
1875 }
1876 }
1877 }
1878
1879 private void DeleteRequestedJoints()
1880 {
1881 List<string> myRequestedJointsToBeDeleted;
1882 lock (externalJointRequestsLock)
1883 {
1884 // make a local copy of the shared list for processing (threading issues)
1885 myRequestedJointsToBeDeleted = new List<string>(requestedJointsToBeDeleted);
1886 }
1887
1888 foreach (string jointName in myRequestedJointsToBeDeleted)
1889 {
1890 lock (OdeLock)
1891 {
1892 //m_log.Debug("[NINJA] trying to deleting requested joint " + jointName);
1893 if (SOPName_to_activeJoint.ContainsKey(jointName) || SOPName_to_pendingJoint.ContainsKey(jointName))
1894 {
1895 OdePhysicsJoint joint = null;
1896 if (SOPName_to_activeJoint.ContainsKey(jointName))
1897 {
1898 joint = SOPName_to_activeJoint[jointName] as OdePhysicsJoint;
1899 InternalRemoveActiveJoint(joint);
1900 }
1901 else if (SOPName_to_pendingJoint.ContainsKey(jointName))
1902 {
1903 joint = SOPName_to_pendingJoint[jointName] as OdePhysicsJoint;
1904 InternalRemovePendingJoint(joint);
1905 }
1906
1907 if (joint != null)
1908 {
1909 //m_log.Debug("joint.BodyNames.Count is " + joint.BodyNames.Count + " and contents " + joint.BodyNames);
1910 for (int iBodyName = 0; iBodyName < 2; iBodyName++)
1911 {
1912 string bodyName = joint.BodyNames[iBodyName];
1913 if (bodyName != "NULL")
1914 {
1915 joints_connecting_actor[bodyName].Remove(joint);
1916 if (joints_connecting_actor[bodyName].Count == 0)
1917 {
1918 joints_connecting_actor.Remove(bodyName);
1919 }
1920 }
1921 }
1922
1923 DoJointDeactivated(joint);
1924 if (joint.jointID != IntPtr.Zero)
1925 {
1926 d.JointDestroy(joint.jointID);
1927 joint.jointID = IntPtr.Zero;
1928 //DoJointErrorMessage(joint, "successfully destroyed joint " + jointName);
1929 }
1930 else
1931 {
1932 //m_log.Warn("[NINJA] Ignoring re-request to destroy joint " + jointName);
1933 }
1934 }
1935 else
1936 {
1937 // DoJointErrorMessage(joint, "coult not find joint to destroy based on name " + jointName);
1938 }
1939 }
1940 else
1941 {
1942 // DoJointErrorMessage(joint, "WARNING - joint removal failed, joint " + jointName);
1943 }
1944 }
1945 }
1946
1947 // remove processed joints from the shared list
1948 lock (externalJointRequestsLock)
1949 {
1950 foreach (string jointName in myRequestedJointsToBeDeleted)
1951 {
1952 requestedJointsToBeDeleted.Remove(jointName);
1953 }
1954 }
1955 }
1956
1957 // for pending joints we don't know if their associated bodies exist yet or not.
1958 // the joint is actually created during processing of the taints
1959 private void CreateRequestedJoints()
1960 {
1961 List<PhysicsJoint> myRequestedJointsToBeCreated;
1962 lock (externalJointRequestsLock)
1963 {
1964 // make a local copy of the shared list for processing (threading issues)
1965 myRequestedJointsToBeCreated = new List<PhysicsJoint>(requestedJointsToBeCreated);
1966 }
1967
1968 foreach (PhysicsJoint joint in myRequestedJointsToBeCreated)
1969 {
1970 lock (OdeLock)
1971 {
1972 if (SOPName_to_pendingJoint.ContainsKey(joint.ObjectNameInScene) && SOPName_to_pendingJoint[joint.ObjectNameInScene] != null)
1973 {
1974 DoJointErrorMessage(joint, "WARNING: ignoring request to re-add already pending joint Name:" + joint.ObjectNameInScene + " type:" + joint.Type + " parms: " + joint.RawParams + " pos: " + joint.Position + " rot:" + joint.Rotation);
1975 continue;
1976 }
1977 if (SOPName_to_activeJoint.ContainsKey(joint.ObjectNameInScene) && SOPName_to_activeJoint[joint.ObjectNameInScene] != null)
1978 {
1979 DoJointErrorMessage(joint, "WARNING: ignoring request to re-add already active joint Name:" + joint.ObjectNameInScene + " type:" + joint.Type + " parms: " + joint.RawParams + " pos: " + joint.Position + " rot:" + joint.Rotation);
1980 continue;
1981 }
1982
1983 InternalAddPendingJoint(joint as OdePhysicsJoint);
1984
1985 if (joint.BodyNames.Count >= 2)
1986 {
1987 for (int iBodyName = 0; iBodyName < 2; iBodyName++)
1988 {
1989 string bodyName = joint.BodyNames[iBodyName];
1990 if (bodyName != "NULL")
1991 {
1992 if (!joints_connecting_actor.ContainsKey(bodyName))
1993 {
1994 joints_connecting_actor.Add(bodyName, new List<PhysicsJoint>());
1995 }
1996 joints_connecting_actor[bodyName].Add(joint);
1997 }
1998 }
1999 }
2000 }
2001 }
2002
2003 // remove processed joints from shared list
2004 lock (externalJointRequestsLock)
2005 {
2006 foreach (PhysicsJoint joint in myRequestedJointsToBeCreated)
2007 {
2008 requestedJointsToBeCreated.Remove(joint);
2009 }
2010 }
2011
2012 }
2013
2014 // public function to add an request for joint creation
2015 // this joint will just be added to a waiting list that is NOT processed during the main
2016 // Simulate() loop (to avoid deadlocks). After Simulate() is finished, we handle unprocessed joint requests.
2017
2018 public override PhysicsJoint RequestJointCreation(string objectNameInScene, PhysicsJointType jointType, Vector3 position,
2019 Quaternion rotation, string parms, List<string> bodyNames, string trackedBodyName, Quaternion localRotation)
2020
2021 {
2022
2023 OdePhysicsJoint joint = new OdePhysicsJoint();
2024 joint.ObjectNameInScene = objectNameInScene;
2025 joint.Type = jointType;
2026 joint.Position = position;
2027 joint.Rotation = rotation;
2028 joint.RawParams = parms;
2029 joint.BodyNames = new List<string>(bodyNames);
2030 joint.TrackedBodyName = trackedBodyName;
2031 joint.LocalRotation = localRotation;
2032 joint.jointID = IntPtr.Zero;
2033 joint.ErrorMessageCount = 0;
2034
2035 lock (externalJointRequestsLock)
2036 {
2037 if (!requestedJointsToBeCreated.Contains(joint)) // forbid same creation request from entering twice
2038 {
2039 requestedJointsToBeCreated.Add(joint);
2040 }
2041 }
2042 return joint;
2043 }
2044
2045 private void RemoveAllJointsConnectedToActor(PhysicsActor actor)
2046 {
2047 //m_log.Debug("RemoveAllJointsConnectedToActor: start");
2048 if (actor.SOPName != null && joints_connecting_actor.ContainsKey(actor.SOPName) && joints_connecting_actor[actor.SOPName] != null)
2049 {
2050
2051 List<PhysicsJoint> jointsToRemove = new List<PhysicsJoint>();
2052 //TODO: merge these 2 loops (originally it was needed to avoid altering a list being iterated over, but it is no longer needed due to the joint request queue mechanism)
2053 foreach (PhysicsJoint j in joints_connecting_actor[actor.SOPName])
2054 {
2055 jointsToRemove.Add(j);
2056 }
2057 foreach (PhysicsJoint j in jointsToRemove)
2058 {
2059 //m_log.Debug("RemoveAllJointsConnectedToActor: about to request deletion of " + j.ObjectNameInScene);
2060 RequestJointDeletion(j.ObjectNameInScene);
2061 //m_log.Debug("RemoveAllJointsConnectedToActor: done request deletion of " + j.ObjectNameInScene);
2062 j.TrackedBodyName = null; // *IMMEDIATELY* prevent any further movement of this joint (else a deleted actor might cause spurious tracking motion of the joint for a few frames, leading to the joint proxy object disappearing)
2063 }
2064 }
2065 }
2066
2067 public override void RemoveAllJointsConnectedToActorThreadLocked(PhysicsActor actor)
2068 {
2069 //m_log.Debug("RemoveAllJointsConnectedToActorThreadLocked: start");
2070 lock (OdeLock)
2071 {
2072 //m_log.Debug("RemoveAllJointsConnectedToActorThreadLocked: got lock");
2073 RemoveAllJointsConnectedToActor(actor);
2074 }
2075 }
2076
2077 // normally called from within OnJointMoved, which is called from within a lock (OdeLock)
2078 public override Vector3 GetJointAnchor(PhysicsJoint joint)
2079 {
2080 Debug.Assert(joint.IsInPhysicsEngine);
2081 d.Vector3 pos = new d.Vector3();
2082
2083 if (!(joint is OdePhysicsJoint))
2084 {
2085 DoJointErrorMessage(joint, "warning: non-ODE joint requesting anchor: " + joint.ObjectNameInScene);
2086 }
2087 else
2088 {
2089 OdePhysicsJoint odeJoint = (OdePhysicsJoint)joint;
2090 switch (odeJoint.Type)
2091 {
2092 case PhysicsJointType.Ball:
2093 d.JointGetBallAnchor(odeJoint.jointID, out pos);
2094 break;
2095 case PhysicsJointType.Hinge:
2096 d.JointGetHingeAnchor(odeJoint.jointID, out pos);
2097 break;
2098 }
2099 }
2100 return new Vector3(pos.X, pos.Y, pos.Z);
2101 }
2102
2103 // normally called from within OnJointMoved, which is called from within a lock (OdeLock)
2104 // WARNING: ODE sometimes returns <0,0,0> as the joint axis! Therefore this function
2105 // appears to be unreliable. Fortunately we can compute the joint axis ourselves by
2106 // keeping track of the joint's original orientation relative to one of the involved bodies.
2107 public override Vector3 GetJointAxis(PhysicsJoint joint)
2108 {
2109 Debug.Assert(joint.IsInPhysicsEngine);
2110 d.Vector3 axis = new d.Vector3();
2111
2112 if (!(joint is OdePhysicsJoint))
2113 {
2114 DoJointErrorMessage(joint, "warning: non-ODE joint requesting anchor: " + joint.ObjectNameInScene);
2115 }
2116 else
2117 {
2118 OdePhysicsJoint odeJoint = (OdePhysicsJoint)joint;
2119 switch (odeJoint.Type)
2120 {
2121 case PhysicsJointType.Ball:
2122 DoJointErrorMessage(joint, "warning - axis requested for ball joint: " + joint.ObjectNameInScene);
2123 break;
2124 case PhysicsJointType.Hinge:
2125 d.JointGetHingeAxis(odeJoint.jointID, out axis);
2126 break;
2127 }
2128 }
2129 return new Vector3(axis.X, axis.Y, axis.Z);
2130 }
2131
2132
2133 public void remActivePrim(OdePrim deactivatePrim)
2134 {
2135 lock (_activeprims)
2136 {
2137 _activeprims.Remove(deactivatePrim);
2138 }
2139 }
2140
2141 public override void RemovePrim(PhysicsActor prim)
2142 {
2143 if (prim is OdePrim)
2144 {
2145 lock (OdeLock)
2146 {
2147 OdePrim p = (OdePrim) prim;
2148
2149 p.setPrimForRemoval();
2150 AddPhysicsActorTaint(prim);
2151 //RemovePrimThreadLocked(p);
2152 }
2153 }
2154 }
2155
2156 /// <summary>
2157 /// This is called from within simulate but outside the locked portion
2158 /// We need to do our own locking here
2159 /// Essentially, we need to remove the prim from our space segment, whatever segment it's in.
2160 ///
2161 /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory
2162 /// that the space was using.
2163 /// </summary>
2164 /// <param name="prim"></param>
2165 public void RemovePrimThreadLocked(OdePrim prim)
2166 {
2167//Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName);
2168 lock (prim)
2169 {
2170 remCollisionEventReporting(prim);
2171 lock (ode)
2172 {
2173 if (prim.prim_geom != IntPtr.Zero)
2174 {
2175 prim.ResetTaints();
2176
2177 if (prim.IsPhysical)
2178 {
2179 prim.disableBody();
2180 if (prim.childPrim)
2181 {
2182 prim.childPrim = false;
2183 prim.Body = IntPtr.Zero;
2184 prim.m_disabled = true;
2185 prim.IsPhysical = false;
2186 }
2187
2188
2189 }
2190 // we don't want to remove the main space
2191
2192 // If the geometry is in the targetspace, remove it from the target space
2193 //m_log.Warn(prim.m_targetSpace);
2194
2195 //if (prim.m_targetSpace != IntPtr.Zero)
2196 //{
2197 //if (d.SpaceQuery(prim.m_targetSpace, prim.prim_geom))
2198 //{
2199
2200 //if (d.GeomIsSpace(prim.m_targetSpace))
2201 //{
2202 //waitForSpaceUnlock(prim.m_targetSpace);
2203 //d.SpaceRemove(prim.m_targetSpace, prim.prim_geom);
2204 prim.m_targetSpace = IntPtr.Zero;
2205 //}
2206 //else
2207 //{
2208 // m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
2209 //((OdePrim)prim).m_targetSpace.ToString());
2210 //}
2211
2212 //}
2213 //}
2214 //m_log.Warn(prim.prim_geom);
2215 try
2216 {
2217 if (prim.prim_geom != IntPtr.Zero)
2218 {
2219
2220//string tPA;
2221//geom_name_map.TryGetValue(prim.prim_geom, out tPA);
2222//Console.WriteLine("**** Remove {0}", tPA);
2223 if(geom_name_map.ContainsKey(prim.prim_geom)) geom_name_map.Remove(prim.prim_geom);
2224 if(actor_name_map.ContainsKey(prim.prim_geom)) actor_name_map.Remove(prim.prim_geom);
2225 d.GeomDestroy(prim.prim_geom);
2226 prim.prim_geom = IntPtr.Zero;
2227 }
2228 else
2229 {
2230 m_log.Warn("[PHYSICS]: Unable to remove prim from physics scene");
2231 }
2232 }
2233 catch (AccessViolationException)
2234 {
2235 m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed.");
2236 }
2237 lock (_prims)
2238 _prims.Remove(prim);
2239
2240 //If there are no more geometries in the sub-space, we don't need it in the main space anymore
2241 //if (d.SpaceGetNumGeoms(prim.m_targetSpace) == 0)
2242 //{
2243 //if (prim.m_targetSpace != null)
2244 //{
2245 //if (d.GeomIsSpace(prim.m_targetSpace))
2246 //{
2247 //waitForSpaceUnlock(prim.m_targetSpace);
2248 //d.SpaceRemove(space, prim.m_targetSpace);
2249 // free up memory used by the space.
2250 //d.SpaceDestroy(prim.m_targetSpace);
2251 //int[] xyspace = calculateSpaceArrayItemFromPos(prim.Position);
2252 //resetSpaceArrayItemToZero(xyspace[0], xyspace[1]);
2253 //}
2254 //else
2255 //{
2256 //m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
2257 //((OdePrim) prim).m_targetSpace.ToString());
2258 //}
2259 //}
2260 //}
2261
2262 if (SupportsNINJAJoints)
2263 {
2264 RemoveAllJointsConnectedToActorThreadLocked(prim);
2265 }
2266 }
2267 }
2268 }
2269 }
2270
2271 #endregion
2272
2273 #region Space Separation Calculation
2274
2275 /// <summary>
2276 /// Takes a space pointer and zeros out the array we're using to hold the spaces
2277 /// </summary>
2278 /// <param name="pSpace"></param>
2279 public void resetSpaceArrayItemToZero(IntPtr pSpace)
2280 {
2281 for (int x = 0; x < staticPrimspace.GetLength(0); x++)
2282 {
2283 for (int y = 0; y < staticPrimspace.GetLength(1); y++)
2284 {
2285 if (staticPrimspace[x, y] == pSpace)
2286 staticPrimspace[x, y] = IntPtr.Zero;
2287 }
2288 }
2289 }
2290
2291 public void resetSpaceArrayItemToZero(int arrayitemX, int arrayitemY)
2292 {
2293 staticPrimspace[arrayitemX, arrayitemY] = IntPtr.Zero;
2294 }
2295
2296 /// <summary>
2297 /// Called when a static prim moves. Allocates a space for the prim based on its position
2298 /// </summary>
2299 /// <param name="geom">the pointer to the geom that moved</param>
2300 /// <param name="pos">the position that the geom moved to</param>
2301 /// <param name="currentspace">a pointer to the space it was in before it was moved.</param>
2302 /// <returns>a pointer to the new space it's in</returns>
2303 public IntPtr recalculateSpaceForGeom(IntPtr geom, Vector3 pos, IntPtr currentspace)
2304 {
2305 // Called from setting the Position and Size of an ODEPrim so
2306 // it's already in locked space.
2307
2308 // we don't want to remove the main space
2309 // we don't need to test physical here because this function should
2310 // never be called if the prim is physical(active)
2311
2312 // All physical prim end up in the root space
2313 //Thread.Sleep(20);
2314 if (currentspace != space)
2315 {
2316 //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString());
2317 //if (currentspace == IntPtr.Zero)
2318 //{
2319 //int adfadf = 0;
2320 //}
2321 if (d.SpaceQuery(currentspace, geom) && currentspace != IntPtr.Zero)
2322 {
2323 if (d.GeomIsSpace(currentspace))
2324 {
2325 waitForSpaceUnlock(currentspace);
2326 d.SpaceRemove(currentspace, geom);
2327 }
2328 else
2329 {
2330 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" + currentspace +
2331 " Geom:" + geom);
2332 }
2333 }
2334 else
2335 {
2336 IntPtr sGeomIsIn = d.GeomGetSpace(geom);
2337 if (sGeomIsIn != IntPtr.Zero)
2338 {
2339 if (d.GeomIsSpace(currentspace))
2340 {
2341 waitForSpaceUnlock(sGeomIsIn);
2342 d.SpaceRemove(sGeomIsIn, geom);
2343 }
2344 else
2345 {
2346 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2347 sGeomIsIn + " Geom:" + geom);
2348 }
2349 }
2350 }
2351
2352 //If there are no more geometries in the sub-space, we don't need it in the main space anymore
2353 if (d.SpaceGetNumGeoms(currentspace) == 0)
2354 {
2355 if (currentspace != IntPtr.Zero)
2356 {
2357 if (d.GeomIsSpace(currentspace))
2358 {
2359 waitForSpaceUnlock(currentspace);
2360 waitForSpaceUnlock(space);
2361 d.SpaceRemove(space, currentspace);
2362 // free up memory used by the space.
2363
2364 //d.SpaceDestroy(currentspace);
2365 resetSpaceArrayItemToZero(currentspace);
2366 }
2367 else
2368 {
2369 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2370 currentspace + " Geom:" + geom);
2371 }
2372 }
2373 }
2374 }
2375 else
2376 {
2377 // this is a physical object that got disabled. ;.;
2378 if (currentspace != IntPtr.Zero && geom != IntPtr.Zero)
2379 {
2380 if (d.SpaceQuery(currentspace, geom))
2381 {
2382 if (d.GeomIsSpace(currentspace))
2383 {
2384 waitForSpaceUnlock(currentspace);
2385 d.SpaceRemove(currentspace, geom);
2386 }
2387 else
2388 {
2389 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2390 currentspace + " Geom:" + geom);
2391 }
2392 }
2393 else
2394 {
2395 IntPtr sGeomIsIn = d.GeomGetSpace(geom);
2396 if (sGeomIsIn != IntPtr.Zero)
2397 {
2398 if (d.GeomIsSpace(sGeomIsIn))
2399 {
2400 waitForSpaceUnlock(sGeomIsIn);
2401 d.SpaceRemove(sGeomIsIn, geom);
2402 }
2403 else
2404 {
2405 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2406 sGeomIsIn + " Geom:" + geom);
2407 }
2408 }
2409 }
2410 }
2411 }
2412
2413 // The routines in the Position and Size sections do the 'inserting' into the space,
2414 // so all we have to do is make sure that the space that we're putting the prim into
2415 // is in the 'main' space.
2416 int[] iprimspaceArrItem = calculateSpaceArrayItemFromPos(pos);
2417 IntPtr newspace = calculateSpaceForGeom(pos);
2418
2419 if (newspace == IntPtr.Zero)
2420 {
2421 newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
2422 d.HashSpaceSetLevels(newspace, smallHashspaceLow, smallHashspaceHigh);
2423 }
2424
2425 return newspace;
2426 }
2427
2428 /// <summary>
2429 /// Creates a new space at X Y
2430 /// </summary>
2431 /// <param name="iprimspaceArrItemX"></param>
2432 /// <param name="iprimspaceArrItemY"></param>
2433 /// <returns>A pointer to the created space</returns>
2434 public IntPtr createprimspace(int iprimspaceArrItemX, int iprimspaceArrItemY)
2435 {
2436 // creating a new space for prim and inserting it into main space.
2437 staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY] = d.HashSpaceCreate(IntPtr.Zero);
2438 d.GeomSetCategoryBits(staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY], (int)CollisionCategories.Space);
2439 waitForSpaceUnlock(space);
2440 d.SpaceSetSublevel(space, 1);
2441 d.SpaceAdd(space, staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]);
2442 return staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY];
2443 }
2444
2445 /// <summary>
2446 /// Calculates the space the prim should be in by its position
2447 /// </summary>
2448 /// <param name="pos"></param>
2449 /// <returns>a pointer to the space. This could be a new space or reused space.</returns>
2450 public IntPtr calculateSpaceForGeom(Vector3 pos)
2451 {
2452 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
2453 //m_log.Info("[Physics]: Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
2454 return staticPrimspace[xyspace[0], xyspace[1]];
2455 }
2456
2457 /// <summary>
2458 /// Holds the space allocation logic
2459 /// </summary>
2460 /// <param name="pos"></param>
2461 /// <returns>an array item based on the position</returns>
2462 public int[] calculateSpaceArrayItemFromPos(Vector3 pos)
2463 {
2464 int[] returnint = new int[2];
2465
2466 returnint[0] = (int) (pos.X/metersInSpace);
2467
2468 if (returnint[0] > ((int) (259f/metersInSpace)))
2469 returnint[0] = ((int) (259f/metersInSpace));
2470 if (returnint[0] < 0)
2471 returnint[0] = 0;
2472
2473 returnint[1] = (int) (pos.Y/metersInSpace);
2474 if (returnint[1] > ((int) (259f/metersInSpace)))
2475 returnint[1] = ((int) (259f/metersInSpace));
2476 if (returnint[1] < 0)
2477 returnint[1] = 0;
2478
2479 return returnint;
2480 }
2481
2482 #endregion
2483
2484 /// <summary>
2485 /// Routine to figure out if we need to mesh this prim with our mesher
2486 /// </summary>
2487 /// <param name="pbs"></param>
2488 /// <returns></returns>
2489 public bool needsMeshing(PrimitiveBaseShape pbs)
2490 {
2491 // most of this is redundant now as the mesher will return null if it cant mesh a prim
2492 // but we still need to check for sculptie meshing being enabled so this is the most
2493 // convenient place to do it for now...
2494
2495 // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f)
2496 // //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
2497 int iPropertiesNotSupportedDefault = 0;
2498
2499 if (pbs.SculptEntry && !meshSculptedPrim)
2500 {
2501#if SPAM
2502 m_log.Warn("NonMesh");
2503#endif
2504 return false;
2505 }
2506
2507 // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
2508 if (!forceSimplePrimMeshing)
2509 {
2510 if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
2511 || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
2512 && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
2513 {
2514
2515 if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
2516 && pbs.ProfileHollow == 0
2517 && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
2518 && pbs.PathBegin == 0 && pbs.PathEnd == 0
2519 && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
2520 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
2521 && pbs.PathShearX == 0 && pbs.PathShearY == 0)
2522 {
2523#if SPAM
2524 m_log.Warn("NonMesh");
2525#endif
2526 return false;
2527 }
2528 }
2529 }
2530
2531 if (pbs.ProfileHollow != 0)
2532 iPropertiesNotSupportedDefault++;
2533
2534 if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0))
2535 iPropertiesNotSupportedDefault++;
2536
2537 if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
2538 iPropertiesNotSupportedDefault++;
2539
2540 if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100))
2541 iPropertiesNotSupportedDefault++;
2542
2543 if ((pbs.PathShearX != 0) || (pbs.PathShearY != 0))
2544 iPropertiesNotSupportedDefault++;
2545
2546 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
2547 iPropertiesNotSupportedDefault++;
2548
2549 if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 && (pbs.Scale.X != pbs.Scale.Y || pbs.Scale.Y != pbs.Scale.Z || pbs.Scale.Z != pbs.Scale.X))
2550 iPropertiesNotSupportedDefault++;
2551
2552 if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte) Extrusion.Curve1)
2553 iPropertiesNotSupportedDefault++;
2554
2555 // test for torus
2556 if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
2557 {
2558 if (pbs.PathCurve == (byte)Extrusion.Curve1)
2559 {
2560 iPropertiesNotSupportedDefault++;
2561 }
2562 }
2563 else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
2564 {
2565 if (pbs.PathCurve == (byte)Extrusion.Straight)
2566 {
2567 iPropertiesNotSupportedDefault++;
2568 }
2569
2570 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
2571 else if (pbs.PathCurve == (byte)Extrusion.Curve1)
2572 {
2573 iPropertiesNotSupportedDefault++;
2574 }
2575 }
2576 else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
2577 {
2578 if (pbs.PathCurve == (byte)Extrusion.Curve1 || pbs.PathCurve == (byte)Extrusion.Curve2)
2579 {
2580 iPropertiesNotSupportedDefault++;
2581 }
2582 }
2583 else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
2584 {
2585 if (pbs.PathCurve == (byte)Extrusion.Straight)
2586 {
2587 iPropertiesNotSupportedDefault++;
2588 }
2589 else if (pbs.PathCurve == (byte)Extrusion.Curve1)
2590 {
2591 iPropertiesNotSupportedDefault++;
2592 }
2593 }
2594
2595
2596 if (iPropertiesNotSupportedDefault == 0)
2597 {
2598#if SPAM
2599 m_log.Warn("NonMesh");
2600#endif
2601 return false;
2602 }
2603#if SPAM
2604 m_log.Debug("Mesh");
2605#endif
2606 return true;
2607 }
2608
2609 /// <summary>
2610 /// Called after our prim properties are set Scale, position etc.
2611 /// We use this event queue like method to keep changes to the physical scene occuring in the threadlocked mutex
2612 /// This assures us that we have no race conditions
2613 /// </summary>
2614 /// <param name="prim"></param>
2615 public override void AddPhysicsActorTaint(PhysicsActor prim)
2616 {
2617
2618 if (prim is OdePrim)
2619 {
2620 OdePrim taintedprim = ((OdePrim) prim);
2621 lock (_taintedPrimLock)
2622 {
2623 if (!(_taintedPrimH.Contains(taintedprim)))
2624 {
2625//Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.m_primName);
2626 _taintedPrimH.Add(taintedprim); // HashSet for searching
2627 _taintedPrimL.Add(taintedprim); // List for ordered readout
2628 }
2629 }
2630 return;
2631 }
2632 else if (prim is OdeCharacter)
2633 {
2634 OdeCharacter taintedchar = ((OdeCharacter)prim);
2635 lock (_taintedActors)
2636 {
2637 if (!(_taintedActors.Contains(taintedchar)))
2638 {
2639 _taintedActors.Add(taintedchar);
2640 if (taintedchar.bad)
2641 m_log.DebugFormat("[PHYSICS]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
2642 }
2643 }
2644 }
2645 }
2646
2647 /// <summary>
2648 /// This is our main simulate loop
2649 /// It's thread locked by a Mutex in the scene.
2650 /// It holds Collisions, it instructs ODE to step through the physical reactions
2651 /// It moves the objects around in memory
2652 /// It calls the methods that report back to the object owners.. (scenepresence, SceneObjectGroup)
2653 /// </summary>
2654 /// <param name="timeStep"></param>
2655 /// <returns></returns>
2656 public override float Simulate(float timeStep)
2657 {
2658 if (framecount >= int.MaxValue)
2659 framecount = 0;
2660 //if (m_worldOffset != Vector3.Zero)
2661 // return 0;
2662
2663 framecount++;
2664
2665 DateTime now = DateTime.UtcNow;
2666 TimeSpan SinceLastFrame = now - m_lastframe;
2667 m_lastframe = now;
2668 float realtime = (float)SinceLastFrame.TotalSeconds;
2669// Console.WriteLine("ts={0} rt={1}", timeStep, realtime);
2670 timeStep = realtime;
2671
2672 // float fps = 1.0f / realtime;
2673 float fps = 0.0f; // number of ODE steps in this Simulate step
2674 //m_log.Info(timeStep.ToString());
2675 step_time += timeStep;
2676
2677 // If We're loaded down by something else,
2678 // or debugging with the Visual Studio project on pause
2679 // skip a few frames to catch up gracefully.
2680 // without shooting the physicsactors all over the place
2681
2682 if (step_time >= m_SkipFramesAtms)
2683 {
2684 // Instead of trying to catch up, it'll do 5 physics frames only
2685 step_time = ODE_STEPSIZE;
2686 m_physicsiterations = 5;
2687 }
2688 else
2689 {
2690 m_physicsiterations = 10;
2691 }
2692
2693 if (SupportsNINJAJoints)
2694 {
2695 DeleteRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
2696 CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
2697 }
2698
2699 lock (OdeLock)
2700 {
2701 // Process 10 frames if the sim is running normal..
2702 // process 5 frames if the sim is running slow
2703 //try
2704 //{
2705 //d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
2706 //}
2707 //catch (StackOverflowException)
2708 //{
2709 // m_log.Error("[PHYSICS]: The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
2710 // ode.drelease(world);
2711 //base.TriggerPhysicsBasedRestart();
2712 //}
2713
2714 int i = 0;
2715
2716 // Figure out the Frames Per Second we're going at.
2717 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size
2718
2719 // fps = (step_time / ODE_STEPSIZE) * 1000;
2720 // HACK: Using a time dilation of 1.0 to debug rubberbanding issues
2721 //m_timeDilation = Math.Min((step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE), 1.0f);
2722
2723 // step_time = 0.09375f;
2724
2725 while (step_time > 0.0f)
2726 {
2727 //lock (ode)
2728 //{
2729 //if (!ode.lockquery())
2730 //{
2731 // ode.dlock(world);
2732 try
2733 {
2734 // Insert, remove Characters
2735 bool processedtaints = false;
2736
2737 lock (_taintedActors)
2738 {
2739 if (_taintedActors.Count > 0)
2740 {
2741 foreach (OdeCharacter character in _taintedActors)
2742 {
2743
2744 character.ProcessTaints(ODE_STEPSIZE);
2745
2746 processedtaints = true;
2747 //character.m_collisionscore = 0;
2748 }
2749
2750 if (processedtaints)
2751 _taintedActors.Clear();
2752 }
2753 } // end lock _taintedActors
2754
2755 // Modify other objects in the scene.
2756 processedtaints = false;
2757
2758 lock (_taintedPrimLock)
2759 {
2760 foreach (OdePrim prim in _taintedPrimL)
2761 {
2762 if (prim.m_taintremove)
2763 {
2764 //Console.WriteLine("Simulate calls RemovePrimThreadLocked");
2765 RemovePrimThreadLocked(prim);
2766 }
2767 else
2768 {
2769 //Console.WriteLine("Simulate calls ProcessTaints");
2770 prim.ProcessTaints(ODE_STEPSIZE);
2771 }
2772 processedtaints = true;
2773 prim.m_collisionscore = 0;
2774
2775 // This loop can block up the Heartbeat for a very long time on large regions.
2776 // We need to let the Watchdog know that the Heartbeat is not dead
2777 // NOTE: This is currently commented out, but if things like OAR loading are
2778 // timing the heartbeat out we will need to uncomment it
2779 //Watchdog.UpdateThread();
2780 }
2781
2782 if (SupportsNINJAJoints)
2783 {
2784 // Create pending joints, if possible
2785
2786 // joints can only be processed after ALL bodies are processed (and exist in ODE), since creating
2787 // a joint requires specifying the body id of both involved bodies
2788 if (pendingJoints.Count > 0)
2789 {
2790 List<PhysicsJoint> successfullyProcessedPendingJoints = new List<PhysicsJoint>();
2791 //DoJointErrorMessage(joints_connecting_actor, "taint: " + pendingJoints.Count + " pending joints");
2792 foreach (PhysicsJoint joint in pendingJoints)
2793 {
2794 //DoJointErrorMessage(joint, "taint: time to create joint with parms: " + joint.RawParams);
2795 string[] jointParams = joint.RawParams.Split(" ".ToCharArray(),
2796 System.StringSplitOptions.RemoveEmptyEntries);
2797 List<IntPtr> jointBodies = new List<IntPtr>();
2798 bool allJointBodiesAreReady = true;
2799 foreach (string jointParam in jointParams)
2800 {
2801 if (jointParam == "NULL")
2802 {
2803 //DoJointErrorMessage(joint, "attaching NULL joint to world");
2804 jointBodies.Add(IntPtr.Zero);
2805 }
2806 else
2807 {
2808 //DoJointErrorMessage(joint, "looking for prim name: " + jointParam);
2809 bool foundPrim = false;
2810 lock (_prims)
2811 {
2812 foreach (OdePrim prim in _prims) // FIXME: inefficient
2813 {
2814 if (prim.SOPName == jointParam)
2815 {
2816 //DoJointErrorMessage(joint, "found for prim name: " + jointParam);
2817 if (prim.IsPhysical && prim.Body != IntPtr.Zero)
2818 {
2819 jointBodies.Add(prim.Body);
2820 foundPrim = true;
2821 break;
2822 }
2823 else
2824 {
2825 DoJointErrorMessage(joint, "prim name " + jointParam +
2826 " exists but is not (yet) physical; deferring joint creation. " +
2827 "IsPhysical property is " + prim.IsPhysical +
2828 " and body is " + prim.Body);
2829 foundPrim = false;
2830 break;
2831 }
2832 }
2833 }
2834 }
2835 if (foundPrim)
2836 {
2837 // all is fine
2838 }
2839 else
2840 {
2841 allJointBodiesAreReady = false;
2842 break;
2843 }
2844 }
2845 }
2846 if (allJointBodiesAreReady)
2847 {
2848 //DoJointErrorMessage(joint, "allJointBodiesAreReady for " + joint.ObjectNameInScene + " with parms " + joint.RawParams);
2849 if (jointBodies[0] == jointBodies[1])
2850 {
2851 DoJointErrorMessage(joint, "ERROR: joint cannot be created; the joint bodies are the same, body1==body2. Raw body is " + jointBodies[0] + ". raw parms: " + joint.RawParams);
2852 }
2853 else
2854 {
2855 switch (joint.Type)
2856 {
2857 case PhysicsJointType.Ball:
2858 {
2859 IntPtr odeJoint;
2860 //DoJointErrorMessage(joint, "ODE creating ball joint ");
2861 odeJoint = d.JointCreateBall(world, IntPtr.Zero);
2862 //DoJointErrorMessage(joint, "ODE attaching ball joint: " + odeJoint + " with b1:" + jointBodies[0] + " b2:" + jointBodies[1]);
2863 d.JointAttach(odeJoint, jointBodies[0], jointBodies[1]);
2864 //DoJointErrorMessage(joint, "ODE setting ball anchor: " + odeJoint + " to vec:" + joint.Position);
2865 d.JointSetBallAnchor(odeJoint,
2866 joint.Position.X,
2867 joint.Position.Y,
2868 joint.Position.Z);
2869 //DoJointErrorMessage(joint, "ODE joint setting OK");
2870 //DoJointErrorMessage(joint, "The ball joint's bodies are here: b0: ");
2871 //DoJointErrorMessage(joint, "" + (jointBodies[0] != IntPtr.Zero ? "" + d.BodyGetPosition(jointBodies[0]) : "fixed environment"));
2872 //DoJointErrorMessage(joint, "The ball joint's bodies are here: b1: ");
2873 //DoJointErrorMessage(joint, "" + (jointBodies[1] != IntPtr.Zero ? "" + d.BodyGetPosition(jointBodies[1]) : "fixed environment"));
2874
2875 if (joint is OdePhysicsJoint)
2876 {
2877 ((OdePhysicsJoint)joint).jointID = odeJoint;
2878 }
2879 else
2880 {
2881 DoJointErrorMessage(joint, "WARNING: non-ode joint in ODE!");
2882 }
2883 }
2884 break;
2885 case PhysicsJointType.Hinge:
2886 {
2887 IntPtr odeJoint;
2888 //DoJointErrorMessage(joint, "ODE creating hinge joint ");
2889 odeJoint = d.JointCreateHinge(world, IntPtr.Zero);
2890 //DoJointErrorMessage(joint, "ODE attaching hinge joint: " + odeJoint + " with b1:" + jointBodies[0] + " b2:" + jointBodies[1]);
2891 d.JointAttach(odeJoint, jointBodies[0], jointBodies[1]);
2892 //DoJointErrorMessage(joint, "ODE setting hinge anchor: " + odeJoint + " to vec:" + joint.Position);
2893 d.JointSetHingeAnchor(odeJoint,
2894 joint.Position.X,
2895 joint.Position.Y,
2896 joint.Position.Z);
2897 // We use the orientation of the x-axis of the joint's coordinate frame
2898 // as the axis for the hinge.
2899
2900 // Therefore, we must get the joint's coordinate frame based on the
2901 // joint.Rotation field, which originates from the orientation of the
2902 // joint's proxy object in the scene.
2903
2904 // The joint's coordinate frame is defined as the transformation matrix
2905 // that converts a vector from joint-local coordinates into world coordinates.
2906 // World coordinates are defined as the XYZ coordinate system of the sim,
2907 // as shown in the top status-bar of the viewer.
2908
2909 // Once we have the joint's coordinate frame, we extract its X axis (AtAxis)
2910 // and use that as the hinge axis.
2911
2912 //joint.Rotation.Normalize();
2913 Matrix4 proxyFrame = Matrix4.CreateFromQuaternion(joint.Rotation);
2914
2915 // Now extract the X axis of the joint's coordinate frame.
2916
2917 // Do not try to use proxyFrame.AtAxis or you will become mired in the
2918 // tar pit of transposed, inverted, and generally messed-up orientations.
2919 // (In other words, Matrix4.AtAxis() is borked.)
2920 // Vector3 jointAxis = proxyFrame.AtAxis; <--- this path leadeth to madness
2921
2922 // Instead, compute the X axis of the coordinate frame by transforming
2923 // the (1,0,0) vector. At least that works.
2924
2925 //m_log.Debug("PHY: making axis: complete matrix is " + proxyFrame);
2926 Vector3 jointAxis = Vector3.Transform(Vector3.UnitX, proxyFrame);
2927 //m_log.Debug("PHY: making axis: hinge joint axis is " + jointAxis);
2928 //DoJointErrorMessage(joint, "ODE setting hinge axis: " + odeJoint + " to vec:" + jointAxis);
2929 d.JointSetHingeAxis(odeJoint,
2930 jointAxis.X,
2931 jointAxis.Y,
2932 jointAxis.Z);
2933 //d.JointSetHingeParam(odeJoint, (int)dParam.CFM, 0.1f);
2934 if (joint is OdePhysicsJoint)
2935 {
2936 ((OdePhysicsJoint)joint).jointID = odeJoint;
2937 }
2938 else
2939 {
2940 DoJointErrorMessage(joint, "WARNING: non-ode joint in ODE!");
2941 }
2942 }
2943 break;
2944 }
2945 successfullyProcessedPendingJoints.Add(joint);
2946 }
2947 }
2948 else
2949 {
2950 DoJointErrorMessage(joint, "joint could not yet be created; still pending");
2951 }
2952 }
2953 foreach (PhysicsJoint successfullyProcessedJoint in successfullyProcessedPendingJoints)
2954 {
2955 //DoJointErrorMessage(successfullyProcessedJoint, "finalizing succesfully procsssed joint " + successfullyProcessedJoint.ObjectNameInScene + " parms " + successfullyProcessedJoint.RawParams);
2956 //DoJointErrorMessage(successfullyProcessedJoint, "removing from pending");
2957 InternalRemovePendingJoint(successfullyProcessedJoint);
2958 //DoJointErrorMessage(successfullyProcessedJoint, "adding to active");
2959 InternalAddActiveJoint(successfullyProcessedJoint);
2960 //DoJointErrorMessage(successfullyProcessedJoint, "done");
2961 }
2962 }
2963 } // end SupportsNINJAJoints
2964
2965 if (processedtaints)
2966//Console.WriteLine("Simulate calls Clear of _taintedPrim list");
2967 _taintedPrimH.Clear(); // ??? if this only ???
2968 _taintedPrimL.Clear();
2969 } // end lock _taintedPrimLock
2970
2971 // Move characters
2972 lock (_characters)
2973 {
2974 List<OdeCharacter> defects = new List<OdeCharacter>();
2975 foreach (OdeCharacter actor in _characters)
2976 {
2977 if (actor != null)
2978 actor.Move(ODE_STEPSIZE, defects);
2979 }
2980 if (0 != defects.Count)
2981 {
2982 foreach (OdeCharacter defect in defects)
2983 {
2984 RemoveCharacter(defect);
2985 }
2986 }
2987 } // end lock _characters
2988
2989 // Move other active objects
2990 lock (_activeprims)
2991 {
2992 foreach (OdePrim prim in _activeprims)
2993 {
2994 prim.m_collisionscore = 0;
2995 prim.Move(ODE_STEPSIZE);
2996 }
2997 } // end lock _activeprims
2998
2999 //if ((framecount % m_randomizeWater) == 0)
3000 // randomizeWater(waterlevel);
3001
3002 //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
3003 m_rayCastManager.ProcessQueuedRequests();
3004
3005 collision_optimized(ODE_STEPSIZE);
3006
3007 lock (_collisionEventPrim)
3008 {
3009 foreach (PhysicsActor obj in _collisionEventPrim)
3010 {
3011 if (obj == null)
3012 continue;
3013
3014 switch ((ActorTypes)obj.PhysicsActorType)
3015 {
3016 case ActorTypes.Agent:
3017 OdeCharacter cobj = (OdeCharacter)obj;
3018 cobj.AddCollisionFrameTime(100);
3019 cobj.SendCollisions();
3020 break;
3021 case ActorTypes.Prim:
3022 OdePrim pobj = (OdePrim)obj;
3023 pobj.SendCollisions();
3024 break;
3025 }
3026 }
3027 } // end lock _collisionEventPrim
3028
3029 //if (m_global_contactcount > 5)
3030 //{
3031 // m_log.DebugFormat("[PHYSICS]: Contacts:{0}", m_global_contactcount);
3032 //}
3033
3034 m_global_contactcount = 0;
3035
3036 d.WorldQuickStep(world, ODE_STEPSIZE);
3037 d.JointGroupEmpty(contactgroup);
3038 fps++;
3039 //ode.dunlock(world);
3040 } // end try
3041 catch (Exception e)
3042 {
3043 m_log.ErrorFormat("[PHYSICS]: {0}, {1}, {2}", e.Message, e.TargetSite, e);
3044 ode.dunlock(world);
3045 }
3046
3047 step_time -= ODE_STEPSIZE;
3048 i++;
3049 //}
3050 //else
3051 //{
3052 //fps = 0;
3053 //}
3054 //}
3055 } // end while (step_time > 0.0f)
3056
3057 lock (_characters)
3058 {
3059 foreach (OdeCharacter actor in _characters)
3060 {
3061 if (actor != null)
3062 {
3063 if (actor.bad)
3064 m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
3065 actor.UpdatePositionAndVelocity();
3066 }
3067 }
3068 }
3069
3070 lock (_badCharacter)
3071 {
3072 if (_badCharacter.Count > 0)
3073 {
3074 foreach (OdeCharacter chr in _badCharacter)
3075 {
3076 RemoveCharacter(chr);
3077 }
3078 _badCharacter.Clear();
3079 }
3080 }
3081
3082 lock (_activeprims)
3083 {
3084 //if (timeStep < 0.2f)
3085 {
3086 foreach (OdePrim actor in _activeprims)
3087 {
3088 if (actor.IsPhysical && (d.BodyIsEnabled(actor.Body) || !actor._zeroFlag))
3089 {
3090 actor.UpdatePositionAndVelocity();
3091
3092 if (SupportsNINJAJoints)
3093 {
3094 // If an actor moved, move its joint proxy objects as well.
3095 // There seems to be an event PhysicsActor.OnPositionUpdate that could be used
3096 // for this purpose but it is never called! So we just do the joint
3097 // movement code here.
3098
3099 if (actor.SOPName != null &&
3100 joints_connecting_actor.ContainsKey(actor.SOPName) &&
3101 joints_connecting_actor[actor.SOPName] != null &&
3102 joints_connecting_actor[actor.SOPName].Count > 0)
3103 {
3104 foreach (PhysicsJoint affectedJoint in joints_connecting_actor[actor.SOPName])
3105 {
3106 if (affectedJoint.IsInPhysicsEngine)
3107 {
3108 DoJointMoved(affectedJoint);
3109 }
3110 else
3111 {
3112 DoJointErrorMessage(affectedJoint, "a body connected to a joint was moved, but the joint doesn't exist yet! this will lead to joint error. joint was: " + affectedJoint.ObjectNameInScene + " parms:" + affectedJoint.RawParams);
3113 }
3114 }
3115 }
3116 }
3117 }
3118 }
3119 }
3120 } // end lock _activeprims
3121
3122 //DumpJointInfo();
3123
3124 // Finished with all sim stepping. If requested, dump world state to file for debugging.
3125 // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?
3126 // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots?
3127 if (physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0))
3128 {
3129 string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename
3130 string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file
3131
3132 if (physics_logging_append_existing_logfile)
3133 {
3134 string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------";
3135 TextWriter fwriter = File.AppendText(fname);
3136 fwriter.WriteLine(header);
3137 fwriter.Close();
3138 }
3139 d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
3140 }
3141 } // end lock OdeLock
3142
3143 return fps * 1000.0f; //NB This is a FRAME COUNT, not a time! AND is divide by 1000 in SimStatusReporter!
3144 } // end Simulate
3145
3146 public override void GetResults()
3147 {
3148 }
3149
3150 public override bool IsThreaded
3151 {
3152 // for now we won't be multithreaded
3153 get { return (false); }
3154 }
3155
3156 #region ODE Specific Terrain Fixes
3157 public float[] ResizeTerrain512NearestNeighbour(float[] heightMap)
3158 {
3159 float[] returnarr = new float[262144];
3160 float[,] resultarr = new float[(int)WorldExtents.X, (int)WorldExtents.Y];
3161
3162 // Filling out the array into its multi-dimensional components
3163 for (int y = 0; y < WorldExtents.Y; y++)
3164 {
3165 for (int x = 0; x < WorldExtents.X; x++)
3166 {
3167 resultarr[y, x] = heightMap[y * (int)WorldExtents.Y + x];
3168 }
3169 }
3170
3171 // Resize using Nearest Neighbour
3172
3173 // This particular way is quick but it only works on a multiple of the original
3174
3175 // The idea behind this method can be described with the following diagrams
3176 // second pass and third pass happen in the same loop really.. just separated
3177 // them to show what this does.
3178
3179 // First Pass
3180 // ResultArr:
3181 // 1,1,1,1,1,1
3182 // 1,1,1,1,1,1
3183 // 1,1,1,1,1,1
3184 // 1,1,1,1,1,1
3185 // 1,1,1,1,1,1
3186 // 1,1,1,1,1,1
3187
3188 // Second Pass
3189 // ResultArr2:
3190 // 1,,1,,1,,1,,1,,1,
3191 // ,,,,,,,,,,
3192 // 1,,1,,1,,1,,1,,1,
3193 // ,,,,,,,,,,
3194 // 1,,1,,1,,1,,1,,1,
3195 // ,,,,,,,,,,
3196 // 1,,1,,1,,1,,1,,1,
3197 // ,,,,,,,,,,
3198 // 1,,1,,1,,1,,1,,1,
3199 // ,,,,,,,,,,
3200 // 1,,1,,1,,1,,1,,1,
3201
3202 // Third pass fills in the blanks
3203 // ResultArr2:
3204 // 1,1,1,1,1,1,1,1,1,1,1,1
3205 // 1,1,1,1,1,1,1,1,1,1,1,1
3206 // 1,1,1,1,1,1,1,1,1,1,1,1
3207 // 1,1,1,1,1,1,1,1,1,1,1,1
3208 // 1,1,1,1,1,1,1,1,1,1,1,1
3209 // 1,1,1,1,1,1,1,1,1,1,1,1
3210 // 1,1,1,1,1,1,1,1,1,1,1,1
3211 // 1,1,1,1,1,1,1,1,1,1,1,1
3212 // 1,1,1,1,1,1,1,1,1,1,1,1
3213 // 1,1,1,1,1,1,1,1,1,1,1,1
3214 // 1,1,1,1,1,1,1,1,1,1,1,1
3215
3216 // X,Y = .
3217 // X+1,y = ^
3218 // X,Y+1 = *
3219 // X+1,Y+1 = #
3220
3221 // Filling in like this;
3222 // .*
3223 // ^#
3224 // 1st .
3225 // 2nd *
3226 // 3rd ^
3227 // 4th #
3228 // on single loop.
3229
3230 float[,] resultarr2 = new float[512, 512];
3231 for (int y = 0; y < WorldExtents.Y; y++)
3232 {
3233 for (int x = 0; x < WorldExtents.X; x++)
3234 {
3235 resultarr2[y * 2, x * 2] = resultarr[y, x];
3236
3237 if (y < WorldExtents.Y)
3238 {
3239 resultarr2[(y * 2) + 1, x * 2] = resultarr[y, x];
3240 }
3241 if (x < WorldExtents.X)
3242 {
3243 resultarr2[y * 2, (x * 2) + 1] = resultarr[y, x];
3244 }
3245 if (x < WorldExtents.X && y < WorldExtents.Y)
3246 {
3247 resultarr2[(y * 2) + 1, (x * 2) + 1] = resultarr[y, x];
3248 }
3249 }
3250 }
3251
3252 //Flatten out the array
3253 int i = 0;
3254 for (int y = 0; y < 512; y++)
3255 {
3256 for (int x = 0; x < 512; x++)
3257 {
3258 if (resultarr2[y, x] <= 0)
3259 returnarr[i] = 0.0000001f;
3260 else
3261 returnarr[i] = resultarr2[y, x];
3262
3263 i++;
3264 }
3265 }
3266
3267 return returnarr;
3268 }
3269
3270 public float[] ResizeTerrain512Interpolation(float[] heightMap)
3271 {
3272 float[] returnarr = new float[262144];
3273 float[,] resultarr = new float[512,512];
3274
3275 // Filling out the array into its multi-dimensional components
3276 for (int y = 0; y < 256; y++)
3277 {
3278 for (int x = 0; x < 256; x++)
3279 {
3280 resultarr[y, x] = heightMap[y * 256 + x];
3281 }
3282 }
3283
3284 // Resize using interpolation
3285
3286 // This particular way is quick but it only works on a multiple of the original
3287
3288 // The idea behind this method can be described with the following diagrams
3289 // second pass and third pass happen in the same loop really.. just separated
3290 // them to show what this does.
3291
3292 // First Pass
3293 // ResultArr:
3294 // 1,1,1,1,1,1
3295 // 1,1,1,1,1,1
3296 // 1,1,1,1,1,1
3297 // 1,1,1,1,1,1
3298 // 1,1,1,1,1,1
3299 // 1,1,1,1,1,1
3300
3301 // Second Pass
3302 // ResultArr2:
3303 // 1,,1,,1,,1,,1,,1,
3304 // ,,,,,,,,,,
3305 // 1,,1,,1,,1,,1,,1,
3306 // ,,,,,,,,,,
3307 // 1,,1,,1,,1,,1,,1,
3308 // ,,,,,,,,,,
3309 // 1,,1,,1,,1,,1,,1,
3310 // ,,,,,,,,,,
3311 // 1,,1,,1,,1,,1,,1,
3312 // ,,,,,,,,,,
3313 // 1,,1,,1,,1,,1,,1,
3314
3315 // Third pass fills in the blanks
3316 // ResultArr2:
3317 // 1,1,1,1,1,1,1,1,1,1,1,1
3318 // 1,1,1,1,1,1,1,1,1,1,1,1
3319 // 1,1,1,1,1,1,1,1,1,1,1,1
3320 // 1,1,1,1,1,1,1,1,1,1,1,1
3321 // 1,1,1,1,1,1,1,1,1,1,1,1
3322 // 1,1,1,1,1,1,1,1,1,1,1,1
3323 // 1,1,1,1,1,1,1,1,1,1,1,1
3324 // 1,1,1,1,1,1,1,1,1,1,1,1
3325 // 1,1,1,1,1,1,1,1,1,1,1,1
3326 // 1,1,1,1,1,1,1,1,1,1,1,1
3327 // 1,1,1,1,1,1,1,1,1,1,1,1
3328
3329 // X,Y = .
3330 // X+1,y = ^
3331 // X,Y+1 = *
3332 // X+1,Y+1 = #
3333
3334 // Filling in like this;
3335 // .*
3336 // ^#
3337 // 1st .
3338 // 2nd *
3339 // 3rd ^
3340 // 4th #
3341 // on single loop.
3342
3343 float[,] resultarr2 = new float[512,512];
3344 for (int y = 0; y < (int)Constants.RegionSize; y++)
3345 {
3346 for (int x = 0; x < (int)Constants.RegionSize; x++)
3347 {
3348 resultarr2[y*2, x*2] = resultarr[y, x];
3349
3350 if (y < (int)Constants.RegionSize)
3351 {
3352 if (y + 1 < (int)Constants.RegionSize)
3353 {
3354 if (x + 1 < (int)Constants.RegionSize)
3355 {
3356 resultarr2[(y*2) + 1, x*2] = ((resultarr[y, x] + resultarr[y + 1, x] +
3357 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
3358 }
3359 else
3360 {
3361 resultarr2[(y*2) + 1, x*2] = ((resultarr[y, x] + resultarr[y + 1, x])/2);
3362 }
3363 }
3364 else
3365 {
3366 resultarr2[(y*2) + 1, x*2] = resultarr[y, x];
3367 }
3368 }
3369 if (x < (int)Constants.RegionSize)
3370 {
3371 if (x + 1 < (int)Constants.RegionSize)
3372 {
3373 if (y + 1 < (int)Constants.RegionSize)
3374 {
3375 resultarr2[y*2, (x*2) + 1] = ((resultarr[y, x] + resultarr[y + 1, x] +
3376 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
3377 }
3378 else
3379 {
3380 resultarr2[y*2, (x*2) + 1] = ((resultarr[y, x] + resultarr[y, x + 1])/2);
3381 }
3382 }
3383 else
3384 {
3385 resultarr2[y*2, (x*2) + 1] = resultarr[y, x];
3386 }
3387 }
3388 if (x < (int)Constants.RegionSize && y < (int)Constants.RegionSize)
3389 {
3390 if ((x + 1 < (int)Constants.RegionSize) && (y + 1 < (int)Constants.RegionSize))
3391 {
3392 resultarr2[(y*2) + 1, (x*2) + 1] = ((resultarr[y, x] + resultarr[y + 1, x] +
3393 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
3394 }
3395 else
3396 {
3397 resultarr2[(y*2) + 1, (x*2) + 1] = resultarr[y, x];
3398 }
3399 }
3400 }
3401 }
3402 //Flatten out the array
3403 int i = 0;
3404 for (int y = 0; y < 512; y++)
3405 {
3406 for (int x = 0; x < 512; x++)
3407 {
3408 if (Single.IsNaN(resultarr2[y, x]) || Single.IsInfinity(resultarr2[y, x]))
3409 {
3410 m_log.Warn("[PHYSICS]: Non finite heightfield element detected. Setting it to 0");
3411 resultarr2[y, x] = 0;
3412 }
3413 returnarr[i] = resultarr2[y, x];
3414 i++;
3415 }
3416 }
3417
3418 return returnarr;
3419 }
3420
3421 #endregion
3422
3423 public override void SetTerrain(float[] heightMap)
3424 {
3425 if (m_worldOffset != Vector3.Zero && m_parentScene != null)
3426 {
3427 if (m_parentScene is OdeScene)
3428 {
3429 ((OdeScene)m_parentScene).SetTerrain(heightMap, m_worldOffset);
3430 }
3431 }
3432 else
3433 {
3434 SetTerrain(heightMap, m_worldOffset);
3435 }
3436 }
3437
3438 public void SetTerrain(float[] heightMap, Vector3 pOffset)
3439 {
3440
3441 uint regionsize = (uint) Constants.RegionSize; // visible region size eg. 256(M)
3442
3443 uint heightmapWidth = regionsize + 1; // ODE map size 257 x 257 (Meters) (1 extra
3444 uint heightmapHeight = regionsize + 1;
3445
3446 uint heightmapWidthSamples = (uint)regionsize + 2; // Sample file size, 258 x 258 samples
3447 uint heightmapHeightSamples = (uint)regionsize + 2;
3448
3449 // Array of height samples for ODE
3450 float[] _heightmap;
3451 _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)]; // loaded samples 258 x 258
3452
3453 // Other ODE parameters
3454 const float scale = 1.0f;
3455 const float offset = 0.0f;
3456 const float thickness = 2.0f; // Was 0.2f, Larger appears to prevent Av fall-through
3457 const int wrap = 0;
3458
3459 float hfmin = 2000f;
3460 float hfmax = -2000f;
3461 float minele = 0.0f; // Dont allow -ve heights
3462
3463 uint x = 0;
3464 uint y = 0;
3465 uint xx = 0;
3466 uint yy = 0;
3467
3468 // load the height samples array from the heightMap
3469 for ( x = 0; x < heightmapWidthSamples; x++) // 0 to 257
3470 {
3471 for ( y = 0; y < heightmapHeightSamples; y++) // 0 to 257
3472 {
3473 xx = x - 1;
3474 if (xx < 0) xx = 0;
3475 if (xx > (regionsize - 1)) xx = regionsize - 1;
3476
3477 yy = y - 1;
3478 if (yy < 0) yy = 0;
3479 if (yy > (regionsize - 1)) yy = regionsize - 1;
3480 // Input xx = 0 0 1 2 ..... 254 255 255 256 total in
3481 // Output x = 0 1 2 3 ..... 255 256 257 258 total out
3482 float val= heightMap[(yy * regionsize) + xx]; // input from heightMap, <0-255 * 256> <0-255>
3483 if (val < minele) val = minele;
3484 _heightmap[x * (regionsize + 2) + y] = val; // samples output to _heightmap, <0-257 * 258> <0-257>
3485 hfmin = (val < hfmin) ? val : hfmin;
3486 hfmax = (val > hfmax) ? val : hfmax;
3487 }
3488 }
3489
3490 lock (OdeLock)
3491 {
3492 IntPtr GroundGeom = IntPtr.Zero;
3493 if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
3494 {
3495 RegionTerrain.Remove(pOffset);
3496 if (GroundGeom != IntPtr.Zero)
3497 {
3498 if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
3499 {
3500 TerrainHeightFieldHeights.Remove(GroundGeom);
3501 }
3502 d.SpaceRemove(space, GroundGeom);
3503 d.GeomDestroy(GroundGeom);
3504 }
3505 }
3506 IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
3507 d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0,
3508 heightmapWidth, heightmapHeight, (int)heightmapWidthSamples,
3509 (int)heightmapHeightSamples, scale, offset, thickness, wrap);
3510 d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
3511 GroundGeom = d.CreateHeightfield(space, HeightmapData, 1);
3512 if (GroundGeom != IntPtr.Zero)
3513 {
3514 d.GeomSetCategoryBits(GroundGeom, (int)(CollisionCategories.Land));
3515 d.GeomSetCollideBits(GroundGeom, (int)(CollisionCategories.Space));
3516 }
3517 geom_name_map[GroundGeom] = "Terrain";
3518
3519 d.Matrix3 R = new d.Matrix3();
3520
3521 Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
3522 Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
3523 //Axiom.Math.Quaternion q3 = Axiom.Math.Quaternion.FromAngleAxis(3.14f, new Axiom.Math.Vector3(0, 0, 1));
3524
3525 q1 = q1 * q2;
3526 //q1 = q1 * q3;
3527 Vector3 v3;
3528 float angle;
3529 q1.GetAxisAngle(out v3, out angle);
3530
3531 d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
3532 d.GeomSetRotation(GroundGeom, ref R);
3533 d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)) - 0.5f, (pOffset.Y + (regionsize * 0.5f)) - 0.5f, 0);
3534 IntPtr testGround = IntPtr.Zero;
3535 if (RegionTerrain.TryGetValue(pOffset, out testGround))
3536 {
3537 RegionTerrain.Remove(pOffset);
3538 }
3539 RegionTerrain.Add(pOffset, GroundGeom, GroundGeom);
3540 TerrainHeightFieldHeights.Add(GroundGeom,_heightmap);
3541 }
3542 }
3543
3544 public override void DeleteTerrain()
3545 {
3546 }
3547
3548 public float GetWaterLevel()
3549 {
3550 return waterlevel;
3551 }
3552
3553 public override bool SupportsCombining()
3554 {
3555 return true;
3556 }
3557
3558 public override void UnCombine(PhysicsScene pScene)
3559 {
3560 IntPtr localGround = IntPtr.Zero;
3561// float[] localHeightfield;
3562 bool proceed = false;
3563 List<IntPtr> geomDestroyList = new List<IntPtr>();
3564
3565 lock (OdeLock)
3566 {
3567 if (RegionTerrain.TryGetValue(Vector3.Zero, out localGround))
3568 {
3569 foreach (IntPtr geom in TerrainHeightFieldHeights.Keys)
3570 {
3571 if (geom == localGround)
3572 {
3573// localHeightfield = TerrainHeightFieldHeights[geom];
3574 proceed = true;
3575 }
3576 else
3577 {
3578 geomDestroyList.Add(geom);
3579 }
3580 }
3581
3582 if (proceed)
3583 {
3584 m_worldOffset = Vector3.Zero;
3585 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
3586 m_parentScene = null;
3587
3588 foreach (IntPtr g in geomDestroyList)
3589 {
3590 // removingHeightField needs to be done or the garbage collector will
3591 // collect the terrain data before we tell ODE to destroy it causing
3592 // memory corruption
3593 if (TerrainHeightFieldHeights.ContainsKey(g))
3594 {
3595// float[] removingHeightField = TerrainHeightFieldHeights[g];
3596 TerrainHeightFieldHeights.Remove(g);
3597
3598 if (RegionTerrain.ContainsKey(g))
3599 {
3600 RegionTerrain.Remove(g);
3601 }
3602
3603 d.GeomDestroy(g);
3604 //removingHeightField = new float[0];
3605 }
3606 }
3607
3608 }
3609 else
3610 {
3611 m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data.");
3612
3613 }
3614 }
3615 }
3616 }
3617
3618 public override void SetWaterLevel(float baseheight)
3619 {
3620 waterlevel = baseheight;
3621 randomizeWater(waterlevel);
3622 }
3623
3624 public void randomizeWater(float baseheight)
3625 {
3626 const uint heightmapWidth = m_regionWidth + 2;
3627 const uint heightmapHeight = m_regionHeight + 2;
3628 const uint heightmapWidthSamples = m_regionWidth + 2;
3629 const uint heightmapHeightSamples = m_regionHeight + 2;
3630 const float scale = 1.0f;
3631 const float offset = 0.0f;
3632 const float thickness = 2.9f;
3633 const int wrap = 0;
3634
3635 for (int i = 0; i < (258 * 258); i++)
3636 {
3637 _watermap[i] = (baseheight-0.1f) + ((float)fluidRandomizer.Next(1,9) / 10f);
3638 // m_log.Info((baseheight - 0.1f) + ((float)fluidRandomizer.Next(1, 9) / 10f));
3639 }
3640
3641 lock (OdeLock)
3642 {
3643 if (WaterGeom != IntPtr.Zero)
3644 {
3645 d.SpaceRemove(space, WaterGeom);
3646 }
3647 IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
3648 d.GeomHeightfieldDataBuildSingle(HeightmapData, _watermap, 0, heightmapWidth, heightmapHeight,
3649 (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale,
3650 offset, thickness, wrap);
3651 d.GeomHeightfieldDataSetBounds(HeightmapData, m_regionWidth, m_regionHeight);
3652 WaterGeom = d.CreateHeightfield(space, HeightmapData, 1);
3653 if (WaterGeom != IntPtr.Zero)
3654 {
3655 d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water));
3656 d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space));
3657
3658 }
3659 geom_name_map[WaterGeom] = "Water";
3660
3661 d.Matrix3 R = new d.Matrix3();
3662
3663 Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
3664 Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
3665 //Axiom.Math.Quaternion q3 = Axiom.Math.Quaternion.FromAngleAxis(3.14f, new Axiom.Math.Vector3(0, 0, 1));
3666
3667 q1 = q1 * q2;
3668 //q1 = q1 * q3;
3669 Vector3 v3;
3670 float angle;
3671 q1.GetAxisAngle(out v3, out angle);
3672
3673 d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
3674 d.GeomSetRotation(WaterGeom, ref R);
3675 d.GeomSetPosition(WaterGeom, 128, 128, 0);
3676
3677 }
3678
3679 }
3680
3681 public override void Dispose()
3682 {
3683 m_rayCastManager.Dispose();
3684 m_rayCastManager = null;
3685
3686 lock (OdeLock)
3687 {
3688 lock (_prims)
3689 {
3690 foreach (OdePrim prm in _prims)
3691 {
3692 RemovePrim(prm);
3693 }
3694 }
3695
3696 //foreach (OdeCharacter act in _characters)
3697 //{
3698 //RemoveAvatar(act);
3699 //}
3700 d.WorldDestroy(world);
3701 //d.CloseODE();
3702 }
3703 }
3704 public override Dictionary<uint, float> GetTopColliders()
3705 {
3706 Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
3707 int cnt = 0;
3708 lock (_prims)
3709 {
3710 foreach (OdePrim prm in _prims)
3711 {
3712 if (prm.CollisionScore > 0)
3713 {
3714 returncolliders.Add(prm.m_localID, prm.CollisionScore);
3715 cnt++;
3716 prm.CollisionScore = 0f;
3717 if (cnt > 25)
3718 {
3719 break;
3720 }
3721 }
3722 }
3723 }
3724 return returncolliders;
3725 }
3726
3727 public override bool SupportsRayCast()
3728 {
3729 return true;
3730 }
3731
3732 public override void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
3733 {
3734 if (retMethod != null)
3735 {
3736 m_rayCastManager.QueueRequest(position, direction, length, retMethod);
3737 }
3738 }
3739
3740#if USE_DRAWSTUFF
3741 // Keyboard callback
3742 public void command(int cmd)
3743 {
3744 IntPtr geom;
3745 d.Mass mass;
3746 d.Vector3 sides = new d.Vector3(d.RandReal() * 0.5f + 0.1f, d.RandReal() * 0.5f + 0.1f, d.RandReal() * 0.5f + 0.1f);
3747
3748
3749
3750 Char ch = Char.ToLower((Char)cmd);
3751 switch ((Char)ch)
3752 {
3753 case 'w':
3754 try
3755 {
3756 Vector3 rotate = (new Vector3(1, 0, 0) * Quaternion.CreateFromEulers(hpr.Z * Utils.DEG_TO_RAD, hpr.Y * Utils.DEG_TO_RAD, hpr.X * Utils.DEG_TO_RAD));
3757
3758 xyz.X += rotate.X; xyz.Y += rotate.Y; xyz.Z += rotate.Z;
3759 ds.SetViewpoint(ref xyz, ref hpr);
3760 }
3761 catch (ArgumentException)
3762 { hpr.X = 0; }
3763 break;
3764
3765 case 'a':
3766 hpr.X++;
3767 ds.SetViewpoint(ref xyz, ref hpr);
3768 break;
3769
3770 case 's':
3771 try
3772 {
3773 Vector3 rotate2 = (new Vector3(-1, 0, 0) * Quaternion.CreateFromEulers(hpr.Z * Utils.DEG_TO_RAD, hpr.Y * Utils.DEG_TO_RAD, hpr.X * Utils.DEG_TO_RAD));
3774
3775 xyz.X += rotate2.X; xyz.Y += rotate2.Y; xyz.Z += rotate2.Z;
3776 ds.SetViewpoint(ref xyz, ref hpr);
3777 }
3778 catch (ArgumentException)
3779 { hpr.X = 0; }
3780 break;
3781 case 'd':
3782 hpr.X--;
3783 ds.SetViewpoint(ref xyz, ref hpr);
3784 break;
3785 case 'r':
3786 xyz.Z++;
3787 ds.SetViewpoint(ref xyz, ref hpr);
3788 break;
3789 case 'f':
3790 xyz.Z--;
3791 ds.SetViewpoint(ref xyz, ref hpr);
3792 break;
3793 case 'e':
3794 xyz.Y++;
3795 ds.SetViewpoint(ref xyz, ref hpr);
3796 break;
3797 case 'q':
3798 xyz.Y--;
3799 ds.SetViewpoint(ref xyz, ref hpr);
3800 break;
3801 }
3802 }
3803
3804 public void step(int pause)
3805 {
3806
3807 ds.SetColor(1.0f, 1.0f, 0.0f);
3808 ds.SetTexture(ds.Texture.Wood);
3809 lock (_prims)
3810 {
3811 foreach (OdePrim prm in _prims)
3812 {
3813 //IntPtr body = d.GeomGetBody(prm.prim_geom);
3814 if (prm.prim_geom != IntPtr.Zero)
3815 {
3816 d.Vector3 pos;
3817 d.GeomCopyPosition(prm.prim_geom, out pos);
3818 //d.BodyCopyPosition(body, out pos);
3819
3820 d.Matrix3 R;
3821 d.GeomCopyRotation(prm.prim_geom, out R);
3822 //d.BodyCopyRotation(body, out R);
3823
3824
3825 d.Vector3 sides = new d.Vector3();
3826 sides.X = prm.Size.X;
3827 sides.Y = prm.Size.Y;
3828 sides.Z = prm.Size.Z;
3829
3830 ds.DrawBox(ref pos, ref R, ref sides);
3831 }
3832 }
3833 }
3834 ds.SetColor(1.0f, 0.0f, 0.0f);
3835 lock (_characters)
3836 {
3837 foreach (OdeCharacter chr in _characters)
3838 {
3839 if (chr.Shell != IntPtr.Zero)
3840 {
3841 IntPtr body = d.GeomGetBody(chr.Shell);
3842
3843 d.Vector3 pos;
3844 d.GeomCopyPosition(chr.Shell, out pos);
3845 //d.BodyCopyPosition(body, out pos);
3846
3847 d.Matrix3 R;
3848 d.GeomCopyRotation(chr.Shell, out R);
3849 //d.BodyCopyRotation(body, out R);
3850
3851 ds.DrawCapsule(ref pos, ref R, chr.Size.Z, 0.35f);
3852 d.Vector3 sides = new d.Vector3();
3853 sides.X = 0.5f;
3854 sides.Y = 0.5f;
3855 sides.Z = 0.5f;
3856
3857 ds.DrawBox(ref pos, ref R, ref sides);
3858 }
3859 }
3860 }
3861 }
3862
3863 public void start(int unused)
3864 {
3865 ds.SetViewpoint(ref xyz, ref hpr);
3866 }
3867#endif
3868 }
3869}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs
new file mode 100644
index 0000000..69e2d03
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs
@@ -0,0 +1,122 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using Nini.Config;
30using NUnit.Framework;
31using OpenMetaverse;
32using OpenSim.Framework;
33using OpenSim.Region.Physics.Manager;
34using log4net;
35using System.Reflection;
36
37namespace OpenSim.Region.Physics.OdePlugin
38{
39 [TestFixture]
40 public class ODETestClass
41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
44 private OdePlugin cbt;
45 private PhysicsScene ps;
46 private IMeshingPlugin imp;
47
48 [SetUp]
49 public void Initialize()
50 {
51 // Loading ODEPlugin
52 cbt = new OdePlugin();
53 // Loading Zero Mesher
54 imp = new ZeroMesherPlugin();
55 // Getting Physics Scene
56 ps = cbt.GetScene("test");
57 // Initializing Physics Scene.
58 ps.Initialise(imp.GetMesher(),null);
59 float[] _heightmap = new float[(int)Constants.RegionSize * (int)Constants.RegionSize];
60 for (int i = 0; i < ((int)Constants.RegionSize * (int)Constants.RegionSize); i++)
61 {
62 _heightmap[i] = 21f;
63 }
64 ps.SetTerrain(_heightmap);
65 }
66
67 [TearDown]
68 public void Terminate()
69 {
70 ps.DeleteTerrain();
71 ps.Dispose();
72
73 }
74
75 [Test]
76 public void CreateAndDropPhysicalCube()
77 {
78 PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox();
79 Vector3 position = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f), 128f);
80 Vector3 size = new Vector3(0.5f, 0.5f, 0.5f);
81 Quaternion rot = Quaternion.Identity;
82 PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true);
83 OdePrim oprim = (OdePrim)prim;
84 OdeScene pscene = (OdeScene) ps;
85
86 Assert.That(oprim.m_taintadd);
87
88 prim.LocalID = 5;
89
90 for (int i = 0; i < 58; i++)
91 {
92 ps.Simulate(0.133f);
93
94 Assert.That(oprim.prim_geom != (IntPtr)0);
95
96 Assert.That(oprim.m_targetSpace != (IntPtr)0);
97
98 //Assert.That(oprim.m_targetSpace == pscene.space);
99 m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
100
101 Assert.That(!oprim.m_taintadd);
102 m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString());
103
104 // Make sure we're above the ground
105 //Assert.That(prim.Position.Z > 20f);
106 //m_log.Info("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore);
107
108 // Make sure we've got a Body
109 Assert.That(oprim.Body != (IntPtr)0);
110 //m_log.Info(
111 }
112
113 // Make sure we're not somewhere above the ground
114 Assert.That(prim.Position.Z < 21.5f);
115
116 ps.RemovePrim(prim);
117 Assert.That(oprim.m_taintremove);
118 ps.Simulate(0.133f);
119 Assert.That(oprim.Body == (IntPtr)0);
120 }
121 }
122}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs b/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs
new file mode 100644
index 0000000..87ca446
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs
@@ -0,0 +1,98 @@
1/*
2 * Copyright ODE
3 * Ode.NET - .NET bindings for ODE
4 * Jason Perkins (starkos@industriousone.com)
5 * Licensed under the New BSD
6 * Part of the OpenDynamicsEngine
7Open Dynamics Engine
8Copyright (c) 2001-2007, Russell L. Smith.
9All rights reserved.
10
11Redistribution and use in source and binary forms, with or without
12modification, are permitted provided that the following conditions
13are met:
14
15Redistributions of source code must retain the above copyright notice,
16this list of conditions and the following disclaimer.
17
18Redistributions in binary form must reproduce the above copyright notice,
19this list of conditions and the following disclaimer in the documentation
20and/or other materials provided with the distribution.
21
22Neither the names of ODE's copyright owner nor the names of its
23contributors may be used to endorse or promote products derived from
24this software without specific prior written permission.
25
26THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
27"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
28LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
29FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
30OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
31SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
32TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
33PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
34LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
35NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
36SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37 *
38 *
39 */
40
41using System;
42using System.Runtime.InteropServices;
43using Ode.NET;
44
45namespace Drawstuff.NET
46{
47#if dDOUBLE
48 using dReal = System.Double;
49#else
50 using dReal = System.Single;
51#endif
52
53 public static class ds
54 {
55 public const int VERSION = 2;
56
57 public enum Texture
58 {
59 None,
60 Wood
61 }
62
63 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
64 public delegate void CallbackFunction(int arg);
65
66 [StructLayout(LayoutKind.Sequential)]
67 public struct Functions
68 {
69 public int version;
70 public CallbackFunction start;
71 public CallbackFunction step;
72 public CallbackFunction command;
73 public CallbackFunction stop;
74 public string path_to_textures;
75 }
76
77 [DllImport("drawstuff", EntryPoint = "dsDrawBox")]
78 public static extern void DrawBox(ref d.Vector3 pos, ref d.Matrix3 R, ref d.Vector3 sides);
79
80 [DllImport("drawstuff", EntryPoint = "dsDrawCapsule")]
81 public static extern void DrawCapsule(ref d.Vector3 pos, ref d.Matrix3 R, dReal length, dReal radius);
82
83 [DllImport("drawstuff", EntryPoint = "dsDrawConvex")]
84 public static extern void DrawConvex(ref d.Vector3 pos, ref d.Matrix3 R, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
85
86 [DllImport("drawstuff", EntryPoint = "dsSetColor")]
87 public static extern void SetColor(float red, float green, float blue);
88
89 [DllImport("drawstuff", EntryPoint = "dsSetTexture")]
90 public static extern void SetTexture(Texture texture);
91
92 [DllImport("drawstuff", EntryPoint = "dsSetViewpoint")]
93 public static extern void SetViewpoint(ref d.Vector3 xyz, ref d.Vector3 hpr);
94
95 [DllImport("drawstuff", EntryPoint = "dsSimulationLoop")]
96 public static extern void SimulationLoop(int argc, string[] argv, int window_width, int window_height, ref Functions fn);
97 }
98}
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index a2229e8..2a66060 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1210,7 +1210,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1210 1210
1211 public override float APIDDamping{ set { return; } } 1211 public override float APIDDamping{ set { return; } }
1212 1212
1213
1214 public override void SubscribeEvents(int ms) 1213 public override void SubscribeEvents(int ms)
1215 { 1214 {
1216 m_requestedUpdateFrequency = ms; 1215 m_requestedUpdateFrequency = ms;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index c91658e..243e2d7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -572,8 +572,8 @@ namespace OpenSim.Region.Physics.OdePlugin
572 break; 572 break;
573 573
574 case HollowShape.Circle: 574 case HollowShape.Circle:
575 // Hollow shape is a perfect cyllinder in respect to the cube's scale 575 // Hollow shape is a perfect cylinder in respect to the cube's scale
576 // Cyllinder hollow volume calculation 576 // Cylinder hollow volume calculation
577 577
578 hollowVolume *= 0.1963495f * 3.07920140172638f; 578 hollowVolume *= 0.1963495f * 3.07920140172638f;
579 break; 579 break;
@@ -2819,7 +2819,7 @@ Console.WriteLine(" JointCreateFixed");
2819 } 2819 }
2820 public override bool PIDActive { set { m_usePID = value; } } 2820 public override bool PIDActive { set { m_usePID = value; } }
2821 public override float PIDTau { set { m_PIDTau = value; } } 2821 public override float PIDTau { set { m_PIDTau = value; } }
2822 2822
2823 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } 2823 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
2824 public override bool PIDHoverActive { set { m_useHoverPID = value; } } 2824 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2825 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } 2825 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 91ec3df..9ba5ebb 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -301,7 +301,7 @@ namespace OpenSim.Region.Physics.POSPlugin
301 { 301 {
302 set { return; } 302 set { return; }
303 } 303 }
304 304
305 public override Quaternion APIDTarget 305 public override Quaternion APIDTarget
306 { 306 {
307 set { return; } 307 set { return; }
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index ff0e743..d854176 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -88,89 +88,7 @@ namespace OpenSim.Region.RegionCombinerModule
88 public void RegionLoaded(Scene scene) 88 public void RegionLoaded(Scene scene)
89 { 89 {
90 if (enabledYN) 90 if (enabledYN)
91 {
92 RegionLoadedDoWork(scene); 91 RegionLoadedDoWork(scene);
93
94 scene.EventManager.OnNewPresence += NewPresence;
95 }
96 }
97
98 private void NewPresence(ScenePresence presence)
99 {
100 if (presence.IsChildAgent)
101 {
102 byte[] throttleData;
103
104 try
105 {
106 throttleData = presence.ControllingClient.GetThrottlesPacked(1);
107 }
108 catch (NotImplementedException)
109 {
110 return;
111 }
112
113 if (throttleData == null)
114 return;
115
116 if (throttleData.Length == 0)
117 return;
118
119 if (throttleData.Length != 28)
120 return;
121
122 byte[] adjData;
123 int pos = 0;
124
125 if (!BitConverter.IsLittleEndian)
126 {
127 byte[] newData = new byte[7 * 4];
128 Buffer.BlockCopy(throttleData, 0, newData, 0, 7 * 4);
129
130 for (int i = 0; i < 7; i++)
131 Array.Reverse(newData, i * 4, 4);
132
133 adjData = newData;
134 }
135 else
136 {
137 adjData = throttleData;
138 }
139
140 // 0.125f converts from bits to bytes
141 int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
142 int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
143 int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
144 int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
145 int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
146 int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
147 int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
148 // State is a subcategory of task that we allocate a percentage to
149
150
151 //int total = resend + land + wind + cloud + task + texture + asset;
152
153 byte[] data = new byte[7 * 4];
154 int ii = 0;
155
156 Buffer.BlockCopy(Utils.FloatToBytes(resend), 0, data, ii, 4); ii += 4;
157 Buffer.BlockCopy(Utils.FloatToBytes(land * 50), 0, data, ii, 4); ii += 4;
158 Buffer.BlockCopy(Utils.FloatToBytes(wind), 0, data, ii, 4); ii += 4;
159 Buffer.BlockCopy(Utils.FloatToBytes(cloud), 0, data, ii, 4); ii += 4;
160 Buffer.BlockCopy(Utils.FloatToBytes(task), 0, data, ii, 4); ii += 4;
161 Buffer.BlockCopy(Utils.FloatToBytes(texture), 0, data, ii, 4); ii += 4;
162 Buffer.BlockCopy(Utils.FloatToBytes(asset), 0, data, ii, 4);
163
164 try
165 {
166 presence.ControllingClient.SetChildAgentThrottle(data);
167 }
168 catch (NotImplementedException)
169 {
170 return;
171 }
172
173 }
174 } 92 }
175 93
176 private void RegionLoadedDoWork(Scene scene) 94 private void RegionLoadedDoWork(Scene scene)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index ee32755..61e4934 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -248,6 +248,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
248 248
249 } 249 }
250 250
251 public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
252 {
253 // Remove a specific script
254
255 // Remove dataserver events
256 m_Dataserver[engine].RemoveEvents(localID, itemID);
257
258 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
259 if (comms != null)
260 comms.DeleteListener(itemID);
261
262 IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
263 xmlrpc.DeleteChannels(itemID);
264 xmlrpc.CancelSRDRequests(itemID);
265
266 // Remove Sensors
267 m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
268
269 }
270
251 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 271 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
252 { 272 {
253 List<Object> data = new List<Object>(); 273 List<Object> data = new List<Object>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d06b134..dee0d9a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Diagnostics; //for [DebuggerNonUserCode]
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
@@ -81,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
81 /// </summary> 82 /// </summary>
82 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 83 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
83 { 84 {
84 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 85// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
85 protected IScriptEngine m_ScriptEngine; 86 protected IScriptEngine m_ScriptEngine;
86 protected SceneObjectPart m_host; 87 protected SceneObjectPart m_host;
87 protected uint m_localID; 88 protected uint m_localID;
@@ -99,6 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
99 protected int m_notecardLineReadCharsMax = 255; 100 protected int m_notecardLineReadCharsMax = 255;
100 protected int m_scriptConsoleChannel = 0; 101 protected int m_scriptConsoleChannel = 0;
101 protected bool m_scriptConsoleChannelEnabled = false; 102 protected bool m_scriptConsoleChannelEnabled = false;
103 protected bool m_debuggerSafe = false;
102 protected IUrlModule m_UrlModule = null; 104 protected IUrlModule m_UrlModule = null;
103 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = 105 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
104 new Dictionary<UUID, UserInfoCacheEntry>(); 106 new Dictionary<UUID, UserInfoCacheEntry>();
@@ -109,6 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
109 m_host = host; 111 m_host = host;
110 m_localID = localID; 112 m_localID = localID;
111 m_itemID = itemID; 113 m_itemID = itemID;
114 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
112 115
113 m_ScriptDelayFactor = 116 m_ScriptDelayFactor =
114 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); 117 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
@@ -161,6 +164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
161 get { return m_ScriptEngine.World; } 164 get { return m_ScriptEngine.World; }
162 } 165 }
163 166
167 [DebuggerNonUserCode]
164 public void state(string newState) 168 public void state(string newState)
165 { 169 {
166 m_ScriptEngine.SetState(m_itemID, newState); 170 m_ScriptEngine.SetState(m_itemID, newState);
@@ -170,6 +174,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
170 /// Reset the named script. The script must be present 174 /// Reset the named script. The script must be present
171 /// in the same prim. 175 /// in the same prim.
172 /// </summary> 176 /// </summary>
177 [DebuggerNonUserCode]
173 public void llResetScript() 178 public void llResetScript()
174 { 179 {
175 m_host.AddScriptLPS(1); 180 m_host.AddScriptLPS(1);
@@ -226,9 +231,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
226 } 231 }
227 } 232 }
228 233
234 public List<ScenePresence> GetLinkAvatars(int linkType)
235 {
236 List<ScenePresence> ret = new List<ScenePresence>();
237 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
238 return ret;
239
240 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
241
242 switch (linkType)
243 {
244 case ScriptBaseClass.LINK_SET:
245 return avs;
246
247 case ScriptBaseClass.LINK_ROOT:
248 return ret;
249
250 case ScriptBaseClass.LINK_ALL_OTHERS:
251 return avs;
252
253 case ScriptBaseClass.LINK_ALL_CHILDREN:
254 return avs;
255
256 case ScriptBaseClass.LINK_THIS:
257 return ret;
258
259 default:
260 if (linkType < 0)
261 return ret;
262
263 int partCount = m_host.ParentGroup.GetPartCount();
264
265 if (linkType <= partCount)
266 {
267 return ret;
268 }
269 else
270 {
271 linkType = linkType - partCount;
272 if (linkType > avs.Count)
273 {
274 return ret;
275 }
276 else
277 {
278 ret.Add(avs[linkType-1]);
279 return ret;
280 }
281 }
282 }
283 }
284
229 public List<SceneObjectPart> GetLinkParts(int linkType) 285 public List<SceneObjectPart> GetLinkParts(int linkType)
230 { 286 {
231 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 287 List<SceneObjectPart> ret = new List<SceneObjectPart>();
288 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
289 return ret;
232 ret.Add(m_host); 290 ret.Add(m_host);
233 291
234 switch (linkType) 292 switch (linkType)
@@ -288,40 +346,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
288 protected UUID InventorySelf() 346 protected UUID InventorySelf()
289 { 347 {
290 UUID invItemID = new UUID(); 348 UUID invItemID = new UUID();
291 349 bool unlock = false;
292 lock (m_host.TaskInventory) 350 if (!m_host.TaskInventory.IsReadLockedByMe())
351 {
352 m_host.TaskInventory.LockItemsForRead(true);
353 unlock = true;
354 }
355 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
293 { 356 {
294 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 357 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
295 { 358 {
296 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 359 invItemID = inv.Key;
297 { 360 break;
298 invItemID = inv.Key;
299 break;
300 }
301 } 361 }
302 } 362 }
303 363 if (unlock)
364 {
365 m_host.TaskInventory.LockItemsForRead(false);
366 }
304 return invItemID; 367 return invItemID;
305 } 368 }
306 369
307 protected UUID InventoryKey(string name, int type) 370 protected UUID InventoryKey(string name, int type)
308 { 371 {
309 m_host.AddScriptLPS(1); 372 m_host.AddScriptLPS(1);
310 373 m_host.TaskInventory.LockItemsForRead(true);
311 lock (m_host.TaskInventory) 374
375 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
312 { 376 {
313 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 377 if (inv.Value.Name == name)
314 { 378 {
315 if (inv.Value.Name == name) 379 m_host.TaskInventory.LockItemsForRead(false);
380
381 if (inv.Value.Type != type)
316 { 382 {
317 if (inv.Value.Type != type) 383 return UUID.Zero;
318 return UUID.Zero;
319
320 return inv.Value.AssetID;
321 } 384 }
385
386 return inv.Value.AssetID;
322 } 387 }
323 } 388 }
324 389
390 m_host.TaskInventory.LockItemsForRead(false);
325 return UUID.Zero; 391 return UUID.Zero;
326 } 392 }
327 393
@@ -329,17 +395,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
329 { 395 {
330 m_host.AddScriptLPS(1); 396 m_host.AddScriptLPS(1);
331 397
332 lock (m_host.TaskInventory) 398
399 m_host.TaskInventory.LockItemsForRead(true);
400
401 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
333 { 402 {
334 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 403 if (inv.Value.Name == name)
335 { 404 {
336 if (inv.Value.Name == name) 405 m_host.TaskInventory.LockItemsForRead(false);
337 { 406 return inv.Value.AssetID;
338 return inv.Value.AssetID;
339 }
340 } 407 }
341 } 408 }
342 409
410 m_host.TaskInventory.LockItemsForRead(false);
411
412
343 return UUID.Zero; 413 return UUID.Zero;
344 } 414 }
345 415
@@ -481,26 +551,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
481 551
482 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 552 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
483 553
484 // Old implementation of llRot2Euler. Normalization not required as Atan2 function will 554 // Utility function for llRot2Euler
485 // only return values >= -PI (-180 degrees) and <= PI (180 degrees).
486 555
487 public LSL_Vector llRot2Euler(LSL_Rotation r) 556 // normalize an angle between -PI and PI (-180 to +180 degrees)
557 protected double NormalizeAngle(double angle)
558 {
559 if (angle > -Math.PI && angle < Math.PI)
560 return angle;
561
562 int numPis = (int)(Math.PI / angle);
563 double remainder = angle - Math.PI * numPis;
564 if (numPis % 2 == 1)
565 return Math.PI - angle;
566 return remainder;
567 }
568
569 public LSL_Vector llRot2Euler(LSL_Rotation q1)
488 { 570 {
489 m_host.AddScriptLPS(1); 571 m_host.AddScriptLPS(1);
490 //This implementation is from http://lslwiki.net/lslwiki/wakka.php?wakka=LibraryRotationFunctions. ckrinke 572 LSL_Vector eul = new LSL_Vector();
491 LSL_Rotation t = new LSL_Rotation(r.x * r.x, r.y * r.y, r.z * r.z, r.s * r.s); 573
492 double m = (t.x + t.y + t.z + t.s); 574 double sqw = q1.s*q1.s;
493 if (m == 0) return new LSL_Vector(); 575 double sqx = q1.x*q1.x;
494 double n = 2 * (r.y * r.s + r.x * r.z); 576 double sqy = q1.z*q1.z;
495 double p = m * m - n * n; 577 double sqz = q1.y*q1.y;
496 if (p > 0) 578 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
497 return new LSL_Vector(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s)), 579 double test = q1.x*q1.z + q1.y*q1.s;
498 Math.Atan2(n, Math.Sqrt(p)), 580 if (test > 0.4999*unit) { // singularity at north pole
499 Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))); 581 eul.z = 2 * Math.Atan2(q1.x,q1.s);
500 else if (n > 0) 582 eul.y = Math.PI/2;
501 return new LSL_Vector(0.0, Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)); 583 eul.x = 0;
502 else 584 return eul;
503 return new LSL_Vector(0.0, -Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)); 585 }
586 if (test < -0.4999*unit) { // singularity at south pole
587 eul.z = -2 * Math.Atan2(q1.x,q1.s);
588 eul.y = -Math.PI/2;
589 eul.x = 0;
590 return eul;
591 }
592 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
593 eul.y = Math.Asin(2*test/unit);
594 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
595 return eul;
504 } 596 }
505 597
506 /* From wiki: 598 /* From wiki:
@@ -702,77 +794,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
702 { 794 {
703 //A and B should both be normalized 795 //A and B should both be normalized
704 m_host.AddScriptLPS(1); 796 m_host.AddScriptLPS(1);
705 LSL_Rotation rotBetween; 797 /* This method is more accurate than the SL one, and thus causes problems
706 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 798 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
707 // continue calculation. 799
708 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 800 double dotProduct = LSL_Vector.Dot(a, b);
709 { 801 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
710 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 802 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
711 } 803 double angle = Math.Acos(dotProduct / magProduct);
712 else 804 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
713 { 805 double s = Math.Sin(angle / 2);
714 a = LSL_Vector.Norm(a); 806
715 b = LSL_Vector.Norm(b); 807 double x = axis.x * s;
716 double dotProduct = LSL_Vector.Dot(a, b); 808 double y = axis.y * s;
717 // There are two degenerate cases possible. These are for vectors 180 or 809 double z = axis.z * s;
718 // 0 degrees apart. These have to be detected and handled individually. 810 double w = Math.Cos(angle / 2);
719 // 811
720 // Check for vectors 180 degrees apart. 812 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
721 // A dot product of -1 would mean the angle between vectors is 180 degrees. 813 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
722 if (dotProduct < -0.9999999f) 814
723 { 815 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
724 // First assume X axis is orthogonal to the vectors. 816 */
725 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 817
726 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 818 // This method mimics the 180 errors found in SL
727 // Check for near zero vector. A very small non-zero number here will create 819 // See www.euclideanspace.com... angleBetween
728 // a rotation in an undesired direction. 820 LSL_Vector vec_a = a;
729 if (LSL_Vector.Mag(orthoVector) > 0.0001) 821 LSL_Vector vec_b = b;
730 { 822
731 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 823 // Eliminate zero length
732 } 824 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
733 // If the magnitude of the vector was near zero, then assume the X axis is not 825 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
734 // orthogonal and use the Z axis instead. 826 if (vec_a_mag < 0.00001 ||
735 else 827 vec_b_mag < 0.00001)
736 { 828 {
737 // Set 180 z rotation. 829 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
738 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f); 830 }
739 } 831
740 } 832 // Normalize
741 // Check for parallel vectors. 833 vec_a = llVecNorm(vec_a);
742 // A dot product of 1 would mean the angle between vectors is 0 degrees. 834 vec_b = llVecNorm(vec_b);
743 else if (dotProduct > 0.9999999f) 835
744 { 836 // Calculate axis and rotation angle
745 // Set zero rotation. 837 LSL_Vector axis = vec_a % vec_b;
746 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 838 LSL_Float cos_theta = vec_a * vec_b;
747 } 839
748 else 840 // Check if parallel
749 { 841 if (cos_theta > 0.99999)
750 // All special checks have been performed so get the axis of rotation. 842 {
751 LSL_Vector crossProduct = LSL_Vector.Cross(a, b); 843 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
752 // Quarternion s value is the length of the unit vector + dot product. 844 }
753 double qs = 1.0 + dotProduct; 845
754 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs); 846 // Check if anti-parallel
755 // Normalize the rotation. 847 else if (cos_theta < -0.99999)
756 double mag = LSL_Rotation.Mag(rotBetween); 848 {
757 // We shouldn't have to worry about a divide by zero here. The qs value will be 849 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
758 // non-zero because we already know if we're here, then the dotProduct is not -1 so 850 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
759 // qs will not be zero. Also, we've already handled the input vectors being zero so the 851 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
760 // crossProduct vector should also not be zero. 852 }
761 rotBetween.x = rotBetween.x / mag; 853 else // other rotation
762 rotBetween.y = rotBetween.y / mag; 854 {
763 rotBetween.z = rotBetween.z / mag; 855 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
764 rotBetween.s = rotBetween.s / mag; 856 axis = llVecNorm(axis);
765 // Check for undefined values and set zero rotation if any found. This code might not actually be required 857 double x, y, z, s, t;
766 // any longer since zero vectors are checked for at the top. 858 s = Math.Cos(theta);
767 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s)) 859 t = Math.Sin(theta);
768 { 860 x = axis.x * t;
769 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 861 y = axis.y * t;
770 } 862 z = axis.z * t;
771 } 863 return new LSL_Rotation(x,y,z,s);
772 } 864 }
773 return rotBetween; 865 }
774 } 866
775
776 public void llWhisper(int channelID, string text) 867 public void llWhisper(int channelID, string text)
777 { 868 {
778 m_host.AddScriptLPS(1); 869 m_host.AddScriptLPS(1);
@@ -1096,10 +1187,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1096 return detectedParams.TouchUV; 1187 return detectedParams.TouchUV;
1097 } 1188 }
1098 1189
1190 [DebuggerNonUserCode]
1099 public virtual void llDie() 1191 public virtual void llDie()
1100 { 1192 {
1101 m_host.AddScriptLPS(1); 1193 m_host.AddScriptLPS(1);
1102 throw new SelfDeleteException(); 1194 if (!m_host.IsAttachment) throw new SelfDeleteException();
1103 } 1195 }
1104 1196
1105 public LSL_Float llGround(LSL_Vector offset) 1197 public LSL_Float llGround(LSL_Vector offset)
@@ -1172,6 +1264,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1172 1264
1173 public void llSetStatus(int status, int value) 1265 public void llSetStatus(int status, int value)
1174 { 1266 {
1267 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1268 return;
1175 m_host.AddScriptLPS(1); 1269 m_host.AddScriptLPS(1);
1176 1270
1177 int statusrotationaxis = 0; 1271 int statusrotationaxis = 0;
@@ -1402,6 +1496,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1402 { 1496 {
1403 m_host.AddScriptLPS(1); 1497 m_host.AddScriptLPS(1);
1404 1498
1499 SetColor(m_host, color, face);
1500 }
1501
1502 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1503 {
1504 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1505 return;
1506
1507 Primitive.TextureEntry tex = part.Shape.Textures;
1508 Color4 texcolor;
1509 if (face >= 0 && face < GetNumberOfSides(part))
1510 {
1511 texcolor = tex.CreateFace((uint)face).RGBA;
1512 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1513 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1514 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1515 tex.FaceTextures[face].RGBA = texcolor;
1516 part.UpdateTexture(tex);
1517 return;
1518 }
1519 else if (face == ScriptBaseClass.ALL_SIDES)
1520 {
1521 for (uint i = 0; i < GetNumberOfSides(part); i++)
1522 {
1523 if (tex.FaceTextures[i] != null)
1524 {
1525 texcolor = tex.FaceTextures[i].RGBA;
1526 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1527 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1528 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1529 tex.FaceTextures[i].RGBA = texcolor;
1530 }
1531 texcolor = tex.DefaultTexture.RGBA;
1532 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1533 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1534 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1535 tex.DefaultTexture.RGBA = texcolor;
1536 }
1537 part.UpdateTexture(tex);
1538 return;
1539 }
1540
1405 if (face == ScriptBaseClass.ALL_SIDES) 1541 if (face == ScriptBaseClass.ALL_SIDES)
1406 face = SceneObjectPart.ALL_SIDES; 1542 face = SceneObjectPart.ALL_SIDES;
1407 1543
@@ -1410,6 +1546,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1410 1546
1411 public void SetTexGen(SceneObjectPart part, int face,int style) 1547 public void SetTexGen(SceneObjectPart part, int face,int style)
1412 { 1548 {
1549 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1550 return;
1551
1413 Primitive.TextureEntry tex = part.Shape.Textures; 1552 Primitive.TextureEntry tex = part.Shape.Textures;
1414 MappingType textype; 1553 MappingType textype;
1415 textype = MappingType.Default; 1554 textype = MappingType.Default;
@@ -1440,6 +1579,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1440 1579
1441 public void SetGlow(SceneObjectPart part, int face, float glow) 1580 public void SetGlow(SceneObjectPart part, int face, float glow)
1442 { 1581 {
1582 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1583 return;
1584
1443 Primitive.TextureEntry tex = part.Shape.Textures; 1585 Primitive.TextureEntry tex = part.Shape.Textures;
1444 if (face >= 0 && face < GetNumberOfSides(part)) 1586 if (face >= 0 && face < GetNumberOfSides(part))
1445 { 1587 {
@@ -1465,6 +1607,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1465 1607
1466 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1608 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1467 { 1609 {
1610 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1611 return;
1468 1612
1469 Shininess sval = new Shininess(); 1613 Shininess sval = new Shininess();
1470 1614
@@ -1515,6 +1659,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1515 1659
1516 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1660 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1517 { 1661 {
1662 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1663 return;
1664
1518 Primitive.TextureEntry tex = part.Shape.Textures; 1665 Primitive.TextureEntry tex = part.Shape.Textures;
1519 if (face >= 0 && face < GetNumberOfSides(part)) 1666 if (face >= 0 && face < GetNumberOfSides(part))
1520 { 1667 {
@@ -1575,13 +1722,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1575 m_host.AddScriptLPS(1); 1722 m_host.AddScriptLPS(1);
1576 1723
1577 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1724 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1578 1725 if (parts.Count > 0)
1579 foreach (SceneObjectPart part in parts) 1726 {
1580 SetAlpha(part, alpha, face); 1727 try
1728 {
1729 parts[0].ParentGroup.areUpdatesSuspended = true;
1730 foreach (SceneObjectPart part in parts)
1731 SetAlpha(part, alpha, face);
1732 }
1733 finally
1734 {
1735 parts[0].ParentGroup.areUpdatesSuspended = false;
1736 }
1737 }
1581 } 1738 }
1582 1739
1583 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1740 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1584 { 1741 {
1742 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1743 return;
1744
1585 Primitive.TextureEntry tex = part.Shape.Textures; 1745 Primitive.TextureEntry tex = part.Shape.Textures;
1586 Color4 texcolor; 1746 Color4 texcolor;
1587 if (face >= 0 && face < GetNumberOfSides(part)) 1747 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1627,7 +1787,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1627 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1787 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1628 float wind, float tension, LSL_Vector Force) 1788 float wind, float tension, LSL_Vector Force)
1629 { 1789 {
1630 if (part == null) 1790 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1631 return; 1791 return;
1632 1792
1633 if (flexi) 1793 if (flexi)
@@ -1662,7 +1822,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1662 /// <param name="falloff"></param> 1822 /// <param name="falloff"></param>
1663 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1823 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1664 { 1824 {
1665 if (part == null) 1825 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1666 return; 1826 return;
1667 1827
1668 if (light) 1828 if (light)
@@ -1739,15 +1899,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1739 m_host.AddScriptLPS(1); 1899 m_host.AddScriptLPS(1);
1740 1900
1741 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1901 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1742 1902 if (parts.Count > 0)
1743 foreach (SceneObjectPart part in parts) 1903 {
1744 SetTexture(part, texture, face); 1904 try
1745 1905 {
1906 parts[0].ParentGroup.areUpdatesSuspended = true;
1907 foreach (SceneObjectPart part in parts)
1908 SetTexture(part, texture, face);
1909 }
1910 finally
1911 {
1912 parts[0].ParentGroup.areUpdatesSuspended = false;
1913 }
1914 }
1746 ScriptSleep(200); 1915 ScriptSleep(200);
1747 } 1916 }
1748 1917
1749 protected void SetTexture(SceneObjectPart part, string texture, int face) 1918 protected void SetTexture(SceneObjectPart part, string texture, int face)
1750 { 1919 {
1920 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1921 return;
1922
1751 UUID textureID=new UUID(); 1923 UUID textureID=new UUID();
1752 1924
1753 if (!UUID.TryParse(texture, out textureID)) 1925 if (!UUID.TryParse(texture, out textureID))
@@ -1793,6 +1965,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1793 1965
1794 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1966 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1795 { 1967 {
1968 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1969 return;
1970
1796 Primitive.TextureEntry tex = part.Shape.Textures; 1971 Primitive.TextureEntry tex = part.Shape.Textures;
1797 if (face >= 0 && face < GetNumberOfSides(part)) 1972 if (face >= 0 && face < GetNumberOfSides(part))
1798 { 1973 {
@@ -1829,6 +2004,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1829 2004
1830 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2005 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1831 { 2006 {
2007 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2008 return;
2009
1832 Primitive.TextureEntry tex = part.Shape.Textures; 2010 Primitive.TextureEntry tex = part.Shape.Textures;
1833 if (face >= 0 && face < GetNumberOfSides(part)) 2011 if (face >= 0 && face < GetNumberOfSides(part))
1834 { 2012 {
@@ -1865,6 +2043,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1865 2043
1866 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2044 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1867 { 2045 {
2046 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2047 return;
2048
1868 Primitive.TextureEntry tex = part.Shape.Textures; 2049 Primitive.TextureEntry tex = part.Shape.Textures;
1869 if (face >= 0 && face < GetNumberOfSides(part)) 2050 if (face >= 0 && face < GetNumberOfSides(part))
1870 { 2051 {
@@ -1935,6 +2116,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1935 2116
1936 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2117 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
1937 { 2118 {
2119 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2120 return;
2121
1938 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2122 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1939 LSL_Vector currentPos = GetPartLocalPos(part); 2123 LSL_Vector currentPos = GetPartLocalPos(part);
1940 2124
@@ -1951,7 +2135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1951 } 2135 }
1952 else 2136 else
1953 { 2137 {
1954 LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); 2138 LSL_Vector rel_vec = SetPosAdjust(new LSL_Vector(part.OffsetPosition.X, part.OffsetPosition.Y, part.OffsetPosition.Z), targetPos);
1955 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z); 2139 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
1956 SceneObjectGroup parent = part.ParentGroup; 2140 SceneObjectGroup parent = part.ParentGroup;
1957 parent.HasGroupChanged = true; 2141 parent.HasGroupChanged = true;
@@ -2003,9 +2187,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2003 m_host.AddScriptLPS(1); 2187 m_host.AddScriptLPS(1);
2004 2188
2005 // try to let this work as in SL... 2189 // try to let this work as in SL...
2006 if (m_host.ParentID == 0) 2190 if (m_host.LinkNum < 2)
2007 { 2191 {
2008 // special case: If we are root, rotate complete SOG to new rotation 2192 // Special case: If we are root, rotate complete SOG to new
2193 // rotation.
2194 // We are root if the link number is 0 (single prim) or 1
2195 // (root prim). ParentID may be nonzero in attachments and
2196 // using it would cause attachments and HUDs to rotate
2197 // to the wrong positions.
2009 SetRot(m_host, Rot2Quaternion(rot)); 2198 SetRot(m_host, Rot2Quaternion(rot));
2010 } 2199 }
2011 else 2200 else
@@ -2034,6 +2223,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2034 2223
2035 protected void SetRot(SceneObjectPart part, Quaternion rot) 2224 protected void SetRot(SceneObjectPart part, Quaternion rot)
2036 { 2225 {
2226 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2227 return;
2228
2037 part.UpdateRotation(rot); 2229 part.UpdateRotation(rot);
2038 // Update rotation does not move the object in the physics scene if it's a linkset. 2230 // Update rotation does not move the object in the physics scene if it's a linkset.
2039 2231
@@ -2653,12 +2845,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2653 2845
2654 m_host.AddScriptLPS(1); 2846 m_host.AddScriptLPS(1);
2655 2847
2848 m_host.TaskInventory.LockItemsForRead(true);
2656 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2849 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2657 2850 m_host.TaskInventory.LockItemsForRead(false);
2658 lock (m_host.TaskInventory)
2659 {
2660 item = m_host.TaskInventory[invItemID];
2661 }
2662 2851
2663 if (item.PermsGranter == UUID.Zero) 2852 if (item.PermsGranter == UUID.Zero)
2664 return 0; 2853 return 0;
@@ -2733,6 +2922,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2733 if (dist > m_ScriptDistanceFactor * 10.0f) 2922 if (dist > m_ScriptDistanceFactor * 10.0f)
2734 return; 2923 return;
2735 2924
2925 //Clone is thread-safe
2736 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2926 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2737 2927
2738 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2928 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2795,6 +2985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2795 2985
2796 public void llLookAt(LSL_Vector target, double strength, double damping) 2986 public void llLookAt(LSL_Vector target, double strength, double damping)
2797 { 2987 {
2988 /*
2798 m_host.AddScriptLPS(1); 2989 m_host.AddScriptLPS(1);
2799 // Determine where we are looking from 2990 // Determine where we are looking from
2800 LSL_Vector from = llGetPos(); 2991 LSL_Vector from = llGetPos();
@@ -2814,10 +3005,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2814 // the angles of rotation in radians into rotation value 3005 // the angles of rotation in radians into rotation value
2815 3006
2816 LSL_Types.Quaternion rot = llEuler2Rot(angle); 3007 LSL_Types.Quaternion rot = llEuler2Rot(angle);
2817 Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); 3008
2818 m_host.startLookAt(rotation, (float)damping, (float)strength); 3009 // This would only work if your physics system contains an APID controller:
3010 // Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
3011 // m_host.startLookAt(rotation, (float)damping, (float)strength);
3012
2819 // Orient the object to the angle calculated 3013 // Orient the object to the angle calculated
2820 //llSetRot(rot); 3014 llSetRot(rot);
3015 */
3016
3017 //The above code, while nice, doesn't replicate the behaviour of SL and tends to "roll" the object.
3018 //There's probably a smarter way of doing this, my rotation math-fu is weak.
3019 // http://bugs.meta7.com/view.php?id=28
3020 // - Tom
3021
3022 LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d));
3023 llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos()));
3024
3025 }
3026
3027 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3028 {
3029 m_host.AddScriptLPS(1);
3030// NotImplemented("llRotLookAt");
3031 m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
3032
2821 } 3033 }
2822 3034
2823 public void llStopLookAt() 3035 public void llStopLookAt()
@@ -2866,13 +3078,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2866 { 3078 {
2867 TaskInventoryItem item; 3079 TaskInventoryItem item;
2868 3080
2869 lock (m_host.TaskInventory) 3081 m_host.TaskInventory.LockItemsForRead(true);
3082 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2870 { 3083 {
2871 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3084 m_host.TaskInventory.LockItemsForRead(false);
2872 return; 3085 return;
2873 else 3086 }
2874 item = m_host.TaskInventory[InventorySelf()]; 3087 else
3088 {
3089 item = m_host.TaskInventory[InventorySelf()];
2875 } 3090 }
3091 m_host.TaskInventory.LockItemsForRead(false);
2876 3092
2877 if (item.PermsGranter != UUID.Zero) 3093 if (item.PermsGranter != UUID.Zero)
2878 { 3094 {
@@ -2894,13 +3110,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2894 { 3110 {
2895 TaskInventoryItem item; 3111 TaskInventoryItem item;
2896 3112
3113 m_host.TaskInventory.LockItemsForRead(true);
2897 lock (m_host.TaskInventory) 3114 lock (m_host.TaskInventory)
2898 { 3115 {
3116
2899 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3117 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3118 {
3119 m_host.TaskInventory.LockItemsForRead(false);
2900 return; 3120 return;
3121 }
2901 else 3122 else
3123 {
2902 item = m_host.TaskInventory[InventorySelf()]; 3124 item = m_host.TaskInventory[InventorySelf()];
3125 }
2903 } 3126 }
3127 m_host.TaskInventory.LockItemsForRead(false);
2904 3128
2905 m_host.AddScriptLPS(1); 3129 m_host.AddScriptLPS(1);
2906 3130
@@ -2932,19 +3156,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2932 { 3156 {
2933 m_host.AddScriptLPS(1); 3157 m_host.AddScriptLPS(1);
2934 3158
2935 if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2936 return;
2937
2938 TaskInventoryItem item; 3159 TaskInventoryItem item;
2939 3160
2940 lock (m_host.TaskInventory) 3161 m_host.TaskInventory.LockItemsForRead(true);
3162
3163 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2941 { 3164 {
2942 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3165 m_host.TaskInventory.LockItemsForRead(false);
2943 return; 3166 return;
2944 else 3167 }
2945 item = m_host.TaskInventory[InventorySelf()]; 3168 else
3169 {
3170 item = m_host.TaskInventory[InventorySelf()];
2946 } 3171 }
2947 3172
3173 m_host.TaskInventory.LockItemsForRead(false);
3174
2948 if (item.PermsGranter != m_host.OwnerID) 3175 if (item.PermsGranter != m_host.OwnerID)
2949 return; 3176 return;
2950 3177
@@ -2954,10 +3181,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2954 3181
2955 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 3182 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
2956 3183
2957 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3184 grp.AttachToAgent(m_host.OwnerID, (uint)attachment, Vector3.Zero, false);
2958 if (attachmentsModule != null)
2959 attachmentsModule.AttachObject(presence.ControllingClient,
2960 grp, (uint)attachment, false);
2961 } 3185 }
2962 } 3186 }
2963 3187
@@ -2970,13 +3194,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2970 3194
2971 TaskInventoryItem item; 3195 TaskInventoryItem item;
2972 3196
2973 lock (m_host.TaskInventory) 3197 m_host.TaskInventory.LockItemsForRead(true);
3198
3199 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2974 { 3200 {
2975 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3201 m_host.TaskInventory.LockItemsForRead(false);
2976 return; 3202 return;
2977 else 3203 }
2978 item = m_host.TaskInventory[InventorySelf()]; 3204 else
3205 {
3206 item = m_host.TaskInventory[InventorySelf()];
2979 } 3207 }
3208 m_host.TaskInventory.LockItemsForRead(false);
3209
2980 3210
2981 if (item.PermsGranter != m_host.OwnerID) 3211 if (item.PermsGranter != m_host.OwnerID)
2982 return; 3212 return;
@@ -3023,6 +3253,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3023 3253
3024 public void llInstantMessage(string user, string message) 3254 public void llInstantMessage(string user, string message)
3025 { 3255 {
3256 UUID result;
3257 if (!UUID.TryParse(user, out result))
3258 {
3259 ShoutError("An invalid key was passed to llInstantMessage");
3260 ScriptSleep(2000);
3261 return;
3262 }
3263
3264
3026 m_host.AddScriptLPS(1); 3265 m_host.AddScriptLPS(1);
3027 3266
3028 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3267 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3037,14 +3276,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3037 UUID friendTransactionID = UUID.Random(); 3276 UUID friendTransactionID = UUID.Random();
3038 3277
3039 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3278 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3040 3279
3041 GridInstantMessage msg = new GridInstantMessage(); 3280 GridInstantMessage msg = new GridInstantMessage();
3042 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3281 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3043 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3282 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3044 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3283 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3045// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3284// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3046// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3285// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3047 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3286 DateTime dt = DateTime.UtcNow;
3287
3288 // Ticks from UtcNow, but make it look like local. Evil, huh?
3289 dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3290
3291 try
3292 {
3293 // Convert that to the PST timezone
3294 TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3295 dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3296 }
3297 catch
3298 {
3299 // No logging here, as it could be VERY spammy
3300 }
3301
3302 // And make it look local again to fool the unix time util
3303 dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3304
3305 msg.timestamp = (uint)Util.ToUnixTime(dt);
3306
3048 //if (client != null) 3307 //if (client != null)
3049 //{ 3308 //{
3050 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3309 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3058,13 +3317,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3058 msg.message = message.Substring(0, 1024); 3317 msg.message = message.Substring(0, 1024);
3059 else 3318 else
3060 msg.message = message; 3319 msg.message = message;
3061 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3320 msg.dialog = (byte)19; // MessageFromObject
3062 msg.fromGroup = false;// fromGroup; 3321 msg.fromGroup = false;// fromGroup;
3063 msg.offline = (byte)0; //offline; 3322 msg.offline = (byte)0; //offline;
3064 msg.ParentEstateID = 0; //ParentEstateID; 3323 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3065 msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); 3324 msg.Position = new Vector3(m_host.AbsolutePosition);
3066 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3325 msg.RegionID = World.RegionInfo.RegionID.Guid;
3067 msg.binaryBucket = new byte[0];// binaryBucket; 3326 msg.binaryBucket = Util.StringToBytes256(m_host.OwnerID.ToString());
3068 3327
3069 if (m_TransferModule != null) 3328 if (m_TransferModule != null)
3070 { 3329 {
@@ -3084,7 +3343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3084 } 3343 }
3085 3344
3086 emailModule.SendEmail(m_host.UUID, address, subject, message); 3345 emailModule.SendEmail(m_host.UUID, address, subject, message);
3087 ScriptSleep(20000); 3346 ScriptSleep(15000);
3088 } 3347 }
3089 3348
3090 public void llGetNextEmail(string address, string subject) 3349 public void llGetNextEmail(string address, string subject)
@@ -3186,13 +3445,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3186 m_host.AddScriptLPS(1); 3445 m_host.AddScriptLPS(1);
3187 } 3446 }
3188 3447
3189 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3190 {
3191 m_host.AddScriptLPS(1);
3192 Quaternion rot = new Quaternion((float)target.x, (float)target.y, (float)target.z, (float)target.s);
3193 m_host.RotLookAt(rot, (float)strength, (float)damping);
3194 }
3195
3196 public LSL_Integer llStringLength(string str) 3448 public LSL_Integer llStringLength(string str)
3197 { 3449 {
3198 m_host.AddScriptLPS(1); 3450 m_host.AddScriptLPS(1);
@@ -3216,14 +3468,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3216 3468
3217 TaskInventoryItem item; 3469 TaskInventoryItem item;
3218 3470
3219 lock (m_host.TaskInventory) 3471 m_host.TaskInventory.LockItemsForRead(true);
3472 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3220 { 3473 {
3221 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3474 m_host.TaskInventory.LockItemsForRead(false);
3222 return; 3475 return;
3223 else
3224 item = m_host.TaskInventory[InventorySelf()];
3225 } 3476 }
3226 3477 else
3478 {
3479 item = m_host.TaskInventory[InventorySelf()];
3480 }
3481 m_host.TaskInventory.LockItemsForRead(false);
3227 if (item.PermsGranter == UUID.Zero) 3482 if (item.PermsGranter == UUID.Zero)
3228 return; 3483 return;
3229 3484
@@ -3253,13 +3508,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3253 3508
3254 TaskInventoryItem item; 3509 TaskInventoryItem item;
3255 3510
3256 lock (m_host.TaskInventory) 3511 m_host.TaskInventory.LockItemsForRead(true);
3512 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3257 { 3513 {
3258 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3514 m_host.TaskInventory.LockItemsForRead(false);
3259 return; 3515 return;
3260 else 3516 }
3261 item = m_host.TaskInventory[InventorySelf()]; 3517 else
3518 {
3519 item = m_host.TaskInventory[InventorySelf()];
3262 } 3520 }
3521 m_host.TaskInventory.LockItemsForRead(false);
3522
3263 3523
3264 if (item.PermsGranter == UUID.Zero) 3524 if (item.PermsGranter == UUID.Zero)
3265 return; 3525 return;
@@ -3330,10 +3590,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3330 3590
3331 TaskInventoryItem item; 3591 TaskInventoryItem item;
3332 3592
3333 lock (m_host.TaskInventory) 3593
3594 m_host.TaskInventory.LockItemsForRead(true);
3595 if (!m_host.TaskInventory.ContainsKey(invItemID))
3596 {
3597 m_host.TaskInventory.LockItemsForRead(false);
3598 return;
3599 }
3600 else
3334 { 3601 {
3335 item = m_host.TaskInventory[invItemID]; 3602 item = m_host.TaskInventory[invItemID];
3336 } 3603 }
3604 m_host.TaskInventory.LockItemsForRead(false);
3337 3605
3338 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3606 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3339 { 3607 {
@@ -3365,11 +3633,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3365 3633
3366 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3634 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3367 { 3635 {
3368 lock (m_host.TaskInventory) 3636 m_host.TaskInventory.LockItemsForWrite(true);
3369 { 3637 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3370 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3638 m_host.TaskInventory[invItemID].PermsMask = perm;
3371 m_host.TaskInventory[invItemID].PermsMask = perm; 3639 m_host.TaskInventory.LockItemsForWrite(false);
3372 }
3373 3640
3374 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3641 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3375 "run_time_permissions", new Object[] { 3642 "run_time_permissions", new Object[] {
@@ -3389,11 +3656,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3389 3656
3390 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3657 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3391 { 3658 {
3392 lock (m_host.TaskInventory) 3659 m_host.TaskInventory.LockItemsForWrite(true);
3393 { 3660 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3394 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3661 m_host.TaskInventory[invItemID].PermsMask = perm;
3395 m_host.TaskInventory[invItemID].PermsMask = perm; 3662 m_host.TaskInventory.LockItemsForWrite(false);
3396 }
3397 3663
3398 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3664 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3399 "run_time_permissions", new Object[] { 3665 "run_time_permissions", new Object[] {
@@ -3414,11 +3680,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3414 3680
3415 if (!m_waitingForScriptAnswer) 3681 if (!m_waitingForScriptAnswer)
3416 { 3682 {
3417 lock (m_host.TaskInventory) 3683 m_host.TaskInventory.LockItemsForWrite(true);
3418 { 3684 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3419 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3685 m_host.TaskInventory[invItemID].PermsMask = 0;
3420 m_host.TaskInventory[invItemID].PermsMask = 0; 3686 m_host.TaskInventory.LockItemsForWrite(false);
3421 }
3422 3687
3423 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3688 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3424 m_waitingForScriptAnswer=true; 3689 m_waitingForScriptAnswer=true;
@@ -3453,10 +3718,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3453 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3718 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3454 llReleaseControls(); 3719 llReleaseControls();
3455 3720
3456 lock (m_host.TaskInventory) 3721
3457 { 3722 m_host.TaskInventory.LockItemsForWrite(true);
3458 m_host.TaskInventory[invItemID].PermsMask = answer; 3723 m_host.TaskInventory[invItemID].PermsMask = answer;
3459 } 3724 m_host.TaskInventory.LockItemsForWrite(false);
3725
3460 3726
3461 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3727 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3462 "run_time_permissions", new Object[] { 3728 "run_time_permissions", new Object[] {
@@ -3468,16 +3734,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3468 { 3734 {
3469 m_host.AddScriptLPS(1); 3735 m_host.AddScriptLPS(1);
3470 3736
3471 lock (m_host.TaskInventory) 3737 m_host.TaskInventory.LockItemsForRead(true);
3738
3739 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3472 { 3740 {
3473 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3741 if (item.Type == 10 && item.ItemID == m_itemID)
3474 { 3742 {
3475 if (item.Type == 10 && item.ItemID == m_itemID) 3743 m_host.TaskInventory.LockItemsForRead(false);
3476 { 3744 return item.PermsGranter.ToString();
3477 return item.PermsGranter.ToString();
3478 }
3479 } 3745 }
3480 } 3746 }
3747 m_host.TaskInventory.LockItemsForRead(false);
3481 3748
3482 return UUID.Zero.ToString(); 3749 return UUID.Zero.ToString();
3483 } 3750 }
@@ -3486,19 +3753,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3486 { 3753 {
3487 m_host.AddScriptLPS(1); 3754 m_host.AddScriptLPS(1);
3488 3755
3489 lock (m_host.TaskInventory) 3756 m_host.TaskInventory.LockItemsForRead(true);
3757
3758 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3490 { 3759 {
3491 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3760 if (item.Type == 10 && item.ItemID == m_itemID)
3492 { 3761 {
3493 if (item.Type == 10 && item.ItemID == m_itemID) 3762 int perms = item.PermsMask;
3494 { 3763 if (m_automaticLinkPermission)
3495 int perms = item.PermsMask; 3764 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3496 if (m_automaticLinkPermission) 3765 m_host.TaskInventory.LockItemsForRead(false);
3497 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3766 return perms;
3498 return perms;
3499 }
3500 } 3767 }
3501 } 3768 }
3769 m_host.TaskInventory.LockItemsForRead(false);
3502 3770
3503 return 0; 3771 return 0;
3504 } 3772 }
@@ -3520,9 +3788,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3520 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3788 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3521 { 3789 {
3522 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3790 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3523 3791 if (parts.Count > 0)
3524 foreach (SceneObjectPart part in parts) 3792 {
3525 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3793 try
3794 {
3795 parts[0].ParentGroup.areUpdatesSuspended = true;
3796 foreach (SceneObjectPart part in parts)
3797 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3798 }
3799 finally
3800 {
3801 parts[0].ParentGroup.areUpdatesSuspended = false;
3802 }
3803 }
3526 } 3804 }
3527 3805
3528 public void llCreateLink(string target, int parent) 3806 public void llCreateLink(string target, int parent)
@@ -3535,11 +3813,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3535 return; 3813 return;
3536 3814
3537 TaskInventoryItem item; 3815 TaskInventoryItem item;
3538 lock (m_host.TaskInventory) 3816 m_host.TaskInventory.LockItemsForRead(true);
3539 { 3817 item = m_host.TaskInventory[invItemID];
3540 item = m_host.TaskInventory[invItemID]; 3818 m_host.TaskInventory.LockItemsForRead(false);
3541 } 3819
3542
3543 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3820 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3544 && !m_automaticLinkPermission) 3821 && !m_automaticLinkPermission)
3545 { 3822 {
@@ -3560,7 +3837,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3560 3837
3561 if (targetPart != null) 3838 if (targetPart != null)
3562 { 3839 {
3563 if (parent != 0) { 3840 if (parent != 0)
3841 {
3564 parentPrim = m_host.ParentGroup; 3842 parentPrim = m_host.ParentGroup;
3565 childPrim = targetPart.ParentGroup; 3843 childPrim = targetPart.ParentGroup;
3566 } 3844 }
@@ -3592,16 +3870,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3592 m_host.AddScriptLPS(1); 3870 m_host.AddScriptLPS(1);
3593 UUID invItemID = InventorySelf(); 3871 UUID invItemID = InventorySelf();
3594 3872
3595 lock (m_host.TaskInventory) 3873 m_host.TaskInventory.LockItemsForRead(true);
3596 {
3597 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3874 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3598 && !m_automaticLinkPermission) 3875 && !m_automaticLinkPermission)
3599 { 3876 {
3600 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3877 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3878 m_host.TaskInventory.LockItemsForRead(false);
3601 return; 3879 return;
3602 } 3880 }
3603 } 3881 m_host.TaskInventory.LockItemsForRead(false);
3604 3882
3605 if (linknum < ScriptBaseClass.LINK_THIS) 3883 if (linknum < ScriptBaseClass.LINK_THIS)
3606 return; 3884 return;
3607 3885
@@ -3640,10 +3918,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3640 // Restructuring Multiple Prims. 3918 // Restructuring Multiple Prims.
3641 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 3919 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3642 parts.Remove(parentPrim.RootPart); 3920 parts.Remove(parentPrim.RootPart);
3643 foreach (SceneObjectPart part in parts) 3921 if (parts.Count > 0)
3644 { 3922 {
3645 parentPrim.DelinkFromGroup(part.LocalId, true); 3923 try
3924 {
3925 parts[0].ParentGroup.areUpdatesSuspended = true;
3926 foreach (SceneObjectPart part in parts)
3927 {
3928 parentPrim.DelinkFromGroup(part.LocalId, true);
3929 }
3930 }
3931 finally
3932 {
3933 parts[0].ParentGroup.areUpdatesSuspended = false;
3934 }
3646 } 3935 }
3936
3647 parentPrim.HasGroupChanged = true; 3937 parentPrim.HasGroupChanged = true;
3648 parentPrim.ScheduleGroupForFullUpdate(); 3938 parentPrim.ScheduleGroupForFullUpdate();
3649 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 3939 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3652,11 +3942,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3652 { 3942 {
3653 SceneObjectPart newRoot = parts[0]; 3943 SceneObjectPart newRoot = parts[0];
3654 parts.Remove(newRoot); 3944 parts.Remove(newRoot);
3655 foreach (SceneObjectPart part in parts) 3945
3946 try
3656 { 3947 {
3657 part.UpdateFlag = 0; 3948 parts[0].ParentGroup.areUpdatesSuspended = true;
3658 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 3949 foreach (SceneObjectPart part in parts)
3950 {
3951 part.UpdateFlag = 0;
3952 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
3953 }
3659 } 3954 }
3955 finally
3956 {
3957 parts[0].ParentGroup.areUpdatesSuspended = false;
3958 }
3959
3960
3660 newRoot.ParentGroup.HasGroupChanged = true; 3961 newRoot.ParentGroup.HasGroupChanged = true;
3661 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 3962 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3662 } 3963 }
@@ -3702,6 +4003,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3702 } 4003 }
3703 else 4004 else
3704 { 4005 {
4006 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4007 {
4008 linknum -= (m_host.ParentGroup.PrimCount) + 1;
4009
4010 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
4011 if (avatars.Count > linknum)
4012 {
4013 return avatars[linknum].UUID.ToString();
4014 }
4015 }
3705 return UUID.Zero.ToString(); 4016 return UUID.Zero.ToString();
3706 } 4017 }
3707 } 4018 }
@@ -3778,17 +4089,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3778 m_host.AddScriptLPS(1); 4089 m_host.AddScriptLPS(1);
3779 int count = 0; 4090 int count = 0;
3780 4091
3781 lock (m_host.TaskInventory) 4092 m_host.TaskInventory.LockItemsForRead(true);
4093 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3782 { 4094 {
3783 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4095 if (inv.Value.Type == type || type == -1)
3784 { 4096 {
3785 if (inv.Value.Type == type || type == -1) 4097 count = count + 1;
3786 {
3787 count = count + 1;
3788 }
3789 } 4098 }
3790 } 4099 }
3791 4100
4101 m_host.TaskInventory.LockItemsForRead(false);
3792 return count; 4102 return count;
3793 } 4103 }
3794 4104
@@ -3797,16 +4107,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3797 m_host.AddScriptLPS(1); 4107 m_host.AddScriptLPS(1);
3798 ArrayList keys = new ArrayList(); 4108 ArrayList keys = new ArrayList();
3799 4109
3800 lock (m_host.TaskInventory) 4110 m_host.TaskInventory.LockItemsForRead(true);
4111 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3801 { 4112 {
3802 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4113 if (inv.Value.Type == type || type == -1)
3803 { 4114 {
3804 if (inv.Value.Type == type || type == -1) 4115 keys.Add(inv.Value.Name);
3805 {
3806 keys.Add(inv.Value.Name);
3807 }
3808 } 4116 }
3809 } 4117 }
4118 m_host.TaskInventory.LockItemsForRead(false);
3810 4119
3811 if (keys.Count == 0) 4120 if (keys.Count == 0)
3812 { 4121 {
@@ -3843,20 +4152,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3843 } 4152 }
3844 4153
3845 // move the first object found with this inventory name 4154 // move the first object found with this inventory name
3846 lock (m_host.TaskInventory) 4155 m_host.TaskInventory.LockItemsForRead(true);
4156 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3847 { 4157 {
3848 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4158 if (inv.Value.Name == inventory)
3849 { 4159 {
3850 if (inv.Value.Name == inventory) 4160 found = true;
3851 { 4161 objId = inv.Key;
3852 found = true; 4162 assetType = inv.Value.Type;
3853 objId = inv.Key; 4163 objName = inv.Value.Name;
3854 assetType = inv.Value.Type; 4164 break;
3855 objName = inv.Value.Name;
3856 break;
3857 }
3858 } 4165 }
3859 } 4166 }
4167 m_host.TaskInventory.LockItemsForRead(false);
3860 4168
3861 if (!found) 4169 if (!found)
3862 { 4170 {
@@ -3864,9 +4172,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3864 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4172 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3865 } 4173 }
3866 4174
3867 // check if destination is an avatar 4175 // check if destination is an object
3868 if (World.GetScenePresence(destId) != null) 4176 if (World.GetSceneObjectPart(destId) != null)
3869 { 4177 {
4178 // destination is an object
4179 World.MoveTaskInventoryItem(destId, m_host, objId);
4180 }
4181 else
4182 {
4183 ScenePresence presence = World.GetScenePresence(destId);
4184
4185 if (presence == null)
4186 {
4187 UserAccount account =
4188 World.UserAccountService.GetUserAccount(
4189 World.RegionInfo.ScopeID,
4190 destId);
4191
4192 if (account == null)
4193 {
4194 llSay(0, "Can't find destination "+destId.ToString());
4195 return;
4196 }
4197 }
4198
3870 // destination is an avatar 4199 // destination is an avatar
3871 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4200 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3872 4201
@@ -3890,31 +4219,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3890 4219
3891 if (m_TransferModule != null) 4220 if (m_TransferModule != null)
3892 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4221 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4222
4223 //This delay should only occur when giving inventory to avatars.
4224 ScriptSleep(3000);
3893 } 4225 }
3894 else
3895 {
3896 // destination is an object
3897 World.MoveTaskInventoryItem(destId, m_host, objId);
3898 }
3899 ScriptSleep(3000);
3900 } 4226 }
3901 4227
4228 [DebuggerNonUserCode]
3902 public void llRemoveInventory(string name) 4229 public void llRemoveInventory(string name)
3903 { 4230 {
3904 m_host.AddScriptLPS(1); 4231 m_host.AddScriptLPS(1);
3905 4232
3906 lock (m_host.TaskInventory) 4233 List<TaskInventoryItem> inv;
4234 try
3907 { 4235 {
3908 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4236 m_host.TaskInventory.LockItemsForRead(true);
4237 inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
4238 }
4239 finally
4240 {
4241 m_host.TaskInventory.LockItemsForRead(false);
4242 }
4243 foreach (TaskInventoryItem item in inv)
4244 {
4245 if (item.Name == name)
3909 { 4246 {
3910 if (item.Name == name) 4247 if (item.ItemID == m_itemID)
3911 { 4248 throw new ScriptDeleteException();
3912 if (item.ItemID == m_itemID) 4249 else
3913 throw new ScriptDeleteException(); 4250 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3914 else 4251 return;
3915 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3916 return;
3917 }
3918 } 4252 }
3919 } 4253 }
3920 } 4254 }
@@ -3980,6 +4314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3980 ce.time = Util.EnvironmentTickCount(); 4314 ce.time = Util.EnvironmentTickCount();
3981 ce.account = account; 4315 ce.account = account;
3982 ce.pinfo = pinfo; 4316 ce.pinfo = pinfo;
4317 m_userInfoCache[uuid] = ce;
3983 } 4318 }
3984 else 4319 else
3985 { 4320 {
@@ -4055,6 +4390,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4055 { 4390 {
4056 m_host.AddScriptLPS(1); 4391 m_host.AddScriptLPS(1);
4057 4392
4393 //Clone is thread safe
4058 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4394 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
4059 4395
4060 foreach (TaskInventoryItem item in itemDictionary.Values) 4396 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4108,6 +4444,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4108 ScenePresence presence = World.GetScenePresence(agentId); 4444 ScenePresence presence = World.GetScenePresence(agentId);
4109 if (presence != null) 4445 if (presence != null)
4110 { 4446 {
4447 // agent must not be a god
4448 if (presence.GodLevel >= 200) return;
4449
4111 // agent must be over the owners land 4450 // agent must be over the owners land
4112 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4451 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4113 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4452 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
@@ -4167,17 +4506,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4167 UUID soundId = UUID.Zero; 4506 UUID soundId = UUID.Zero;
4168 if (!UUID.TryParse(impact_sound, out soundId)) 4507 if (!UUID.TryParse(impact_sound, out soundId))
4169 { 4508 {
4170 lock (m_host.TaskInventory) 4509 m_host.TaskInventory.LockItemsForRead(true);
4510 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4171 { 4511 {
4172 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4512 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4173 { 4513 {
4174 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4514 soundId = item.AssetID;
4175 { 4515 break;
4176 soundId = item.AssetID;
4177 break;
4178 }
4179 } 4516 }
4180 } 4517 }
4518 m_host.TaskInventory.LockItemsForRead(false);
4181 } 4519 }
4182 m_host.CollisionSound = soundId; 4520 m_host.CollisionSound = soundId;
4183 m_host.CollisionSoundVolume = (float)impact_volume; 4521 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4223,6 +4561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4223 UUID partItemID; 4561 UUID partItemID;
4224 foreach (SceneObjectPart part in parts) 4562 foreach (SceneObjectPart part in parts)
4225 { 4563 {
4564 //Clone is thread safe
4226 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4565 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4227 4566
4228 foreach (TaskInventoryItem item in itemsDictionary.Values) 4567 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4437,17 +4776,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4437 4776
4438 m_host.AddScriptLPS(1); 4777 m_host.AddScriptLPS(1);
4439 4778
4440 lock (m_host.TaskInventory) 4779 m_host.TaskInventory.LockItemsForRead(true);
4780 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4441 { 4781 {
4442 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4782 if (item.Type == 10 && item.ItemID == m_itemID)
4443 { 4783 {
4444 if (item.Type == 10 && item.ItemID == m_itemID) 4784 result = item.Name!=null?item.Name:String.Empty;
4445 { 4785 break;
4446 result = item.Name != null ? item.Name : String.Empty;
4447 break;
4448 }
4449 } 4786 }
4450 } 4787 }
4788 m_host.TaskInventory.LockItemsForRead(false);
4451 4789
4452 return result; 4790 return result;
4453 } 4791 }
@@ -4600,23 +4938,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4600 { 4938 {
4601 m_host.AddScriptLPS(1); 4939 m_host.AddScriptLPS(1);
4602 4940
4603 lock (m_host.TaskInventory) 4941 m_host.TaskInventory.LockItemsForRead(true);
4942 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4604 { 4943 {
4605 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4944 if (inv.Value.Name == name)
4606 { 4945 {
4607 if (inv.Value.Name == name) 4946 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4608 { 4947 {
4609 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 4948 m_host.TaskInventory.LockItemsForRead(false);
4610 { 4949 return inv.Value.AssetID.ToString();
4611 return inv.Value.AssetID.ToString(); 4950 }
4612 } 4951 else
4613 else 4952 {
4614 { 4953 m_host.TaskInventory.LockItemsForRead(false);
4615 return UUID.Zero.ToString(); 4954 return UUID.Zero.ToString();
4616 }
4617 } 4955 }
4618 } 4956 }
4619 } 4957 }
4958 m_host.TaskInventory.LockItemsForRead(false);
4620 4959
4621 return UUID.Zero.ToString(); 4960 return UUID.Zero.ToString();
4622 } 4961 }
@@ -4769,14 +5108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4769 { 5108 {
4770 m_host.AddScriptLPS(1); 5109 m_host.AddScriptLPS(1);
4771 5110
4772 if (src == null) 5111 return src.Length;
4773 {
4774 return 0;
4775 }
4776 else
4777 {
4778 return src.Length;
4779 }
4780 } 5112 }
4781 5113
4782 public LSL_Integer llList2Integer(LSL_List src, int index) 5114 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4822,7 +5154,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4822 else if (src.Data[index] is LSL_Float) 5154 else if (src.Data[index] is LSL_Float)
4823 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5155 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
4824 else if (src.Data[index] is LSL_String) 5156 else if (src.Data[index] is LSL_String)
4825 return Convert.ToDouble(((LSL_String) src.Data[index]).m_string); 5157 {
5158 string str = ((LSL_String) src.Data[index]).m_string;
5159 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5160 if (m != Match.Empty)
5161 {
5162 str = m.Value;
5163 double d = 0.0;
5164 if (!Double.TryParse(str, out d))
5165 return 0.0;
5166
5167 return d;
5168 }
5169 return 0.0;
5170 }
4826 return Convert.ToDouble(src.Data[index]); 5171 return Convert.ToDouble(src.Data[index]);
4827 } 5172 }
4828 catch (FormatException) 5173 catch (FormatException)
@@ -5095,7 +5440,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5095 } 5440 }
5096 } 5441 }
5097 } 5442 }
5098 else { 5443 else
5444 {
5099 object[] array = new object[src.Length]; 5445 object[] array = new object[src.Length];
5100 Array.Copy(src.Data, 0, array, 0, src.Length); 5446 Array.Copy(src.Data, 0, array, 0, src.Length);
5101 result = new LSL_List(array); 5447 result = new LSL_List(array);
@@ -5507,7 +5853,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5507 public void llSetSoundQueueing(int queue) 5853 public void llSetSoundQueueing(int queue)
5508 { 5854 {
5509 m_host.AddScriptLPS(1); 5855 m_host.AddScriptLPS(1);
5510 NotImplemented("llSetSoundQueueing");
5511 } 5856 }
5512 5857
5513 public void llSetSoundRadius(double radius) 5858 public void llSetSoundRadius(double radius)
@@ -5552,10 +5897,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5552 m_host.AddScriptLPS(1); 5897 m_host.AddScriptLPS(1);
5553 5898
5554 List<SceneObjectPart> parts = GetLinkParts(linknumber); 5899 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5555 5900 if (parts.Count > 0)
5556 foreach (var part in parts)
5557 { 5901 {
5558 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 5902 try
5903 {
5904 parts[0].ParentGroup.areUpdatesSuspended = true;
5905 foreach (var part in parts)
5906 {
5907 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
5908 }
5909 }
5910 finally
5911 {
5912 parts[0].ParentGroup.areUpdatesSuspended = false;
5913 }
5559 } 5914 }
5560 } 5915 }
5561 5916
@@ -5609,6 +5964,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5609 ScriptSleep(5000); 5964 ScriptSleep(5000);
5610 } 5965 }
5611 5966
5967 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
5968 {
5969 return ParseString2List(str, separators, in_spacers, false);
5970 }
5971
5612 public LSL_Integer llOverMyLand(string id) 5972 public LSL_Integer llOverMyLand(string id)
5613 { 5973 {
5614 m_host.AddScriptLPS(1); 5974 m_host.AddScriptLPS(1);
@@ -5809,7 +6169,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5809 return m_host.ParentGroup.RootPart.AttachmentPoint; 6169 return m_host.ParentGroup.RootPart.AttachmentPoint;
5810 } 6170 }
5811 6171
5812 public LSL_Integer llGetFreeMemory() 6172 public virtual LSL_Integer llGetFreeMemory()
5813 { 6173 {
5814 m_host.AddScriptLPS(1); 6174 m_host.AddScriptLPS(1);
5815 // Make scripts designed for LSO happy 6175 // Make scripts designed for LSO happy
@@ -5926,7 +6286,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5926 SetParticleSystem(m_host, rules); 6286 SetParticleSystem(m_host, rules);
5927 } 6287 }
5928 6288
5929 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6289 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6290 {
5930 6291
5931 6292
5932 if (rules.Length == 0) 6293 if (rules.Length == 0)
@@ -6120,14 +6481,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6120 6481
6121 protected UUID GetTaskInventoryItem(string name) 6482 protected UUID GetTaskInventoryItem(string name)
6122 { 6483 {
6123 lock (m_host.TaskInventory) 6484 m_host.TaskInventory.LockItemsForRead(true);
6485 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6124 { 6486 {
6125 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6487 if (inv.Value.Name == name)
6126 { 6488 {
6127 if (inv.Value.Name == name) 6489 m_host.TaskInventory.LockItemsForRead(false);
6128 return inv.Key; 6490 return inv.Key;
6129 } 6491 }
6130 } 6492 }
6493 m_host.TaskInventory.LockItemsForRead(false);
6131 6494
6132 return UUID.Zero; 6495 return UUID.Zero;
6133 } 6496 }
@@ -6373,8 +6736,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6373 } 6736 }
6374 if (buttons.Length < 1) 6737 if (buttons.Length < 1)
6375 { 6738 {
6376 LSLError("No less than 1 button can be shown"); 6739 buttons.Add("OK");
6377 return;
6378 } 6740 }
6379 if (buttons.Length > 12) 6741 if (buttons.Length > 12)
6380 { 6742 {
@@ -6455,22 +6817,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6455 } 6817 }
6456 6818
6457 // copy the first script found with this inventory name 6819 // copy the first script found with this inventory name
6458 lock (m_host.TaskInventory) 6820 m_host.TaskInventory.LockItemsForRead(true);
6821 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6459 { 6822 {
6460 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6823 if (inv.Value.Name == name)
6461 { 6824 {
6462 if (inv.Value.Name == name) 6825 // make sure the object is a script
6826 if (10 == inv.Value.Type)
6463 { 6827 {
6464 // make sure the object is a script 6828 found = true;
6465 if (10 == inv.Value.Type) 6829 srcId = inv.Key;
6466 { 6830 break;
6467 found = true;
6468 srcId = inv.Key;
6469 break;
6470 }
6471 } 6831 }
6472 } 6832 }
6473 } 6833 }
6834 m_host.TaskInventory.LockItemsForRead(false);
6474 6835
6475 if (!found) 6836 if (!found)
6476 { 6837 {
@@ -6554,6 +6915,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6554 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) 6915 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist)
6555 { 6916 {
6556 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 6917 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6918 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6919 return shapeBlock;
6557 6920
6558 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 6921 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6559 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 6922 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6629,6 +6992,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6629 6992
6630 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge) 6993 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge)
6631 { 6994 {
6995 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6996 return;
6997
6632 ObjectShapePacket.ObjectDataBlock shapeBlock; 6998 ObjectShapePacket.ObjectDataBlock shapeBlock;
6633 6999
6634 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7000 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6678,6 +7044,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6678 7044
6679 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge) 7045 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge)
6680 { 7046 {
7047 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7048 return;
7049
6681 ObjectShapePacket.ObjectDataBlock shapeBlock; 7050 ObjectShapePacket.ObjectDataBlock shapeBlock;
6682 7051
6683 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7052 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6720,6 +7089,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6720 7089
6721 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte fudge) 7090 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte fudge)
6722 { 7091 {
7092 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7093 return;
7094
6723 ObjectShapePacket.ObjectDataBlock shapeBlock; 7095 ObjectShapePacket.ObjectDataBlock shapeBlock;
6724 7096
6725 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7097 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6846,6 +7218,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6846 7218
6847 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) 7219 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type)
6848 { 7220 {
7221 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7222 return;
7223
6849 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7224 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6850 UUID sculptId; 7225 UUID sculptId;
6851 7226
@@ -6861,13 +7236,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6861 shapeBlock.PathScaleX = 100; 7236 shapeBlock.PathScaleX = 100;
6862 shapeBlock.PathScaleY = 150; 7237 shapeBlock.PathScaleY = 150;
6863 7238
6864 if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER && 7239 if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
6865 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE && 7240 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
6866 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE && 7241 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
6867 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) 7242 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
6868 { 7243 {
6869 // default 7244 // default
6870 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7245 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
6871 } 7246 }
6872 7247
6873 // retain pathcurve 7248 // retain pathcurve
@@ -6886,30 +7261,82 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6886 ScriptSleep(200); 7261 ScriptSleep(200);
6887 } 7262 }
6888 7263
6889 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7264 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
6890 { 7265 {
6891 m_host.AddScriptLPS(1); 7266 m_host.AddScriptLPS(1);
6892 7267
6893 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7268 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7269 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7270 if (parts.Count>0)
7271 {
7272 try
7273 {
7274 parts[0].ParentGroup.areUpdatesSuspended = true;
7275 foreach (SceneObjectPart part in parts)
7276 SetPrimParams(part, rules);
7277 }
7278 finally
7279 {
7280 parts[0].ParentGroup.areUpdatesSuspended = false;
7281 }
7282 }
7283 if (avatars.Count > 0)
7284 {
7285 foreach (ScenePresence avatar in avatars)
7286 SetPrimParams(avatar, rules);
7287 }
7288 }
6894 7289
6895 foreach (SceneObjectPart part in parts) 7290 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
6896 SetPrimParams(part, rules); 7291 {
6897 7292 llSetLinkPrimitiveParamsFast(linknumber, rules);
6898 ScriptSleep(200); 7293 ScriptSleep(200);
6899 } 7294 }
6900 7295
6901 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7296 protected void SetPrimParams(ScenePresence av, LSL_List rules)
6902 { 7297 {
6903 m_host.AddScriptLPS(1); 7298 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7299 //We only support PRIM_POSITION and PRIM_ROTATION
6904 7300
6905 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7301 int idx = 0;
6906 7302
6907 foreach (SceneObjectPart part in parts) 7303 while (idx < rules.Length)
6908 SetPrimParams(part, rules); 7304 {
7305 int code = rules.GetLSLIntegerItem(idx++);
7306
7307 int remain = rules.Length - idx;
7308
7309
7310
7311 switch (code)
7312 {
7313 case (int)ScriptBaseClass.PRIM_POSITION:
7314 if (remain < 1)
7315 return;
7316 LSL_Vector v;
7317 v = rules.GetVector3Item(idx++);
7318 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7319 av.SendFullUpdateToAllClients();
7320
7321 break;
7322
7323 case (int)ScriptBaseClass.PRIM_ROTATION:
7324 if (remain < 1)
7325 return;
7326 LSL_Rotation r;
7327 r = rules.GetQuaternionItem(idx++);
7328 av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7329 av.SendFullUpdateToAllClients();
7330 break;
7331 }
7332 }
6909 } 7333 }
6910 7334
6911 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7335 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
6912 { 7336 {
7337 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7338 return;
7339
6913 int idx = 0; 7340 int idx = 0;
6914 7341
6915 while (idx < rules.Length) 7342 while (idx < rules.Length)
@@ -7444,13 +7871,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7444 public LSL_Integer llGetNumberOfPrims() 7871 public LSL_Integer llGetNumberOfPrims()
7445 { 7872 {
7446 m_host.AddScriptLPS(1); 7873 m_host.AddScriptLPS(1);
7447 int avatarCount = 0; 7874 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
7448 World.ForEachScenePresence(delegate(ScenePresence presence) 7875
7449 {
7450 if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7451 avatarCount++;
7452 });
7453
7454 return m_host.ParentGroup.PrimCount + avatarCount; 7876 return m_host.ParentGroup.PrimCount + avatarCount;
7455 } 7877 }
7456 7878
@@ -7466,55 +7888,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7466 m_host.AddScriptLPS(1); 7888 m_host.AddScriptLPS(1);
7467 UUID objID = UUID.Zero; 7889 UUID objID = UUID.Zero;
7468 LSL_List result = new LSL_List(); 7890 LSL_List result = new LSL_List();
7891
7892 // If the ID is not valid, return null result
7469 if (!UUID.TryParse(obj, out objID)) 7893 if (!UUID.TryParse(obj, out objID))
7470 { 7894 {
7471 result.Add(new LSL_Vector()); 7895 result.Add(new LSL_Vector());
7472 result.Add(new LSL_Vector()); 7896 result.Add(new LSL_Vector());
7473 return result; 7897 return result;
7474 } 7898 }
7899
7900 // Check if this is an attached prim. If so, replace
7901 // the UUID with the avatar UUID and report it's bounding box
7902 SceneObjectPart part = World.GetSceneObjectPart(objID);
7903 if (part != null && part.ParentGroup.IsAttachment)
7904 objID = part.ParentGroup.RootPart.AttachedAvatar;
7905
7906 // Find out if this is an avatar ID. If so, return it's box
7475 ScenePresence presence = World.GetScenePresence(objID); 7907 ScenePresence presence = World.GetScenePresence(objID);
7476 if (presence != null) 7908 if (presence != null)
7477 { 7909 {
7478 if (presence.ParentID == 0) // not sat on an object 7910 // As per LSL Wiki, there is no difference between sitting
7911 // and standing avatar since server 1.36
7912 LSL_Vector lower;
7913 LSL_Vector upper;
7914 if (presence.Animator.Animations.DefaultAnimation.AnimID
7915 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
7479 { 7916 {
7480 LSL_Vector lower; 7917 // This is for ground sitting avatars
7481 LSL_Vector upper; 7918 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7482 if (presence.Animator.Animations.DefaultAnimation.AnimID 7919 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7483 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 7920 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7484 {
7485 // This is for ground sitting avatars
7486 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7487 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7488 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7489 }
7490 else
7491 {
7492 // This is for standing/flying avatars
7493 float height = presence.Appearance.AvatarHeight / 2.0f;
7494 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7495 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7496 }
7497 result.Add(lower);
7498 result.Add(upper);
7499 return result;
7500 } 7921 }
7501 else 7922 else
7502 { 7923 {
7503 // sitting on an object so we need the bounding box of that 7924 // This is for standing/flying avatars
7504 // which should include the avatar so set the UUID to the 7925 float height = presence.Appearance.AvatarHeight / 2.0f;
7505 // UUID of the object the avatar is sat on and allow it to fall through 7926 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7506 // to processing an object 7927 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7507 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
7508 objID = p.UUID;
7509 } 7928 }
7929
7930 // Adjust to the documented error offsets (see LSL Wiki)
7931 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
7932 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
7933
7934 if (lower.x > upper.x)
7935 lower.x = upper.x;
7936 if (lower.y > upper.y)
7937 lower.y = upper.y;
7938 if (lower.z > upper.z)
7939 lower.z = upper.z;
7940
7941 result.Add(lower);
7942 result.Add(upper);
7943 return result;
7510 } 7944 }
7511 SceneObjectPart part = World.GetSceneObjectPart(objID); 7945
7946 part = World.GetSceneObjectPart(objID);
7512 // Currently only works for single prims without a sitting avatar 7947 // Currently only works for single prims without a sitting avatar
7513 if (part != null) 7948 if (part != null)
7514 { 7949 {
7515 Vector3 halfSize = part.Scale / 2.0f; 7950 float minX;
7516 LSL_Vector lower = new LSL_Vector(halfSize.X * -1.0f, halfSize.Y * -1.0f, halfSize.Z * -1.0f); 7951 float maxX;
7517 LSL_Vector upper = new LSL_Vector(halfSize.X, halfSize.Y, halfSize.Z); 7952 float minY;
7953 float maxY;
7954 float minZ;
7955 float maxZ;
7956
7957 // This BBox is in sim coordinates, with the offset being
7958 // a contained point.
7959 Vector3[] offsets = World.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
7960 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
7961
7962 minX -= offsets[0].X;
7963 maxX -= offsets[0].X;
7964 minY -= offsets[0].Y;
7965 maxY -= offsets[0].Y;
7966 minZ -= offsets[0].Z;
7967 maxZ -= offsets[0].Z;
7968
7969 LSL_Vector lower;
7970 LSL_Vector upper;
7971
7972 // Adjust to the documented error offsets (see LSL Wiki)
7973 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
7974 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
7975
7976 if (lower.x > upper.x)
7977 lower.x = upper.x;
7978 if (lower.y > upper.y)
7979 lower.y = upper.y;
7980 if (lower.z > upper.z)
7981 lower.z = upper.z;
7982
7518 result.Add(lower); 7983 result.Add(lower);
7519 result.Add(upper); 7984 result.Add(upper);
7520 return result; 7985 return result;
@@ -7594,13 +8059,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7594 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, 8059 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
7595 part.AbsolutePosition.Y, 8060 part.AbsolutePosition.Y,
7596 part.AbsolutePosition.Z); 8061 part.AbsolutePosition.Z);
7597 // For some reason, the part.AbsolutePosition.* values do not change if the
7598 // linkset is rotated; they always reflect the child prim's world position
7599 // as though the linkset is unrotated. This is incompatible behavior with SL's
7600 // implementation, so will break scripts imported from there (not to mention it
7601 // makes it more difficult to determine a child prim's actual inworld position).
7602 if (part.ParentID != 0)
7603 v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
7604 res.Add(v); 8062 res.Add(v);
7605 break; 8063 break;
7606 8064
@@ -7759,24 +8217,95 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7759 break; 8217 break;
7760 8218
7761 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8219 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
7762 // TODO--------------
7763 if (remain < 1) 8220 if (remain < 1)
7764 return res; 8221 return res;
8222 face = (int)rules.GetLSLIntegerItem(idx++);
7765 8223
7766 face=(int)rules.GetLSLIntegerItem(idx++); 8224 tex = part.Shape.Textures;
7767 8225 int shiny;
7768 res.Add(new LSL_Integer(0)); 8226 if (face == ScriptBaseClass.ALL_SIDES)
7769 res.Add(new LSL_Integer(0)); 8227 {
8228 for (face = 0; face < GetNumberOfSides(part); face++)
8229 {
8230 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8231 if (shinyness == Shininess.High)
8232 {
8233 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8234 }
8235 else if (shinyness == Shininess.Medium)
8236 {
8237 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8238 }
8239 else if (shinyness == Shininess.Low)
8240 {
8241 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8242 }
8243 else
8244 {
8245 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8246 }
8247 res.Add(new LSL_Integer(shiny));
8248 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8249 }
8250 }
8251 else
8252 {
8253 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8254 if (shinyness == Shininess.High)
8255 {
8256 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8257 }
8258 else if (shinyness == Shininess.Medium)
8259 {
8260 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8261 }
8262 else if (shinyness == Shininess.Low)
8263 {
8264 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8265 }
8266 else
8267 {
8268 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8269 }
8270 res.Add(new LSL_Integer(shiny));
8271 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8272 }
7770 break; 8273 break;
7771 8274
7772 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8275 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
7773 // TODO--------------
7774 if (remain < 1) 8276 if (remain < 1)
7775 return res; 8277 return res;
8278 face = (int)rules.GetLSLIntegerItem(idx++);
7776 8279
7777 face=(int)rules.GetLSLIntegerItem(idx++); 8280 tex = part.Shape.Textures;
7778 8281 int fullbright;
7779 res.Add(new LSL_Integer(0)); 8282 if (face == ScriptBaseClass.ALL_SIDES)
8283 {
8284 for (face = 0; face < GetNumberOfSides(part); face++)
8285 {
8286 if (tex.GetFace((uint)face).Fullbright == true)
8287 {
8288 fullbright = ScriptBaseClass.TRUE;
8289 }
8290 else
8291 {
8292 fullbright = ScriptBaseClass.FALSE;
8293 }
8294 res.Add(new LSL_Integer(fullbright));
8295 }
8296 }
8297 else
8298 {
8299 if (tex.GetFace((uint)face).Fullbright == true)
8300 {
8301 fullbright = ScriptBaseClass.TRUE;
8302 }
8303 else
8304 {
8305 fullbright = ScriptBaseClass.FALSE;
8306 }
8307 res.Add(new LSL_Integer(fullbright));
8308 }
7780 break; 8309 break;
7781 8310
7782 case (int)ScriptBaseClass.PRIM_FLEXIBLE: 8311 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
@@ -7797,14 +8326,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7797 break; 8326 break;
7798 8327
7799 case (int)ScriptBaseClass.PRIM_TEXGEN: 8328 case (int)ScriptBaseClass.PRIM_TEXGEN:
7800 // TODO--------------
7801 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) 8329 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
7802 if (remain < 1) 8330 if (remain < 1)
7803 return res; 8331 return res;
8332 face = (int)rules.GetLSLIntegerItem(idx++);
7804 8333
7805 face=(int)rules.GetLSLIntegerItem(idx++); 8334 tex = part.Shape.Textures;
7806 8335 if (face == ScriptBaseClass.ALL_SIDES)
7807 res.Add(new LSL_Integer(0)); 8336 {
8337 for (face = 0; face < GetNumberOfSides(part); face++)
8338 {
8339 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8340 {
8341 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8342 }
8343 else
8344 {
8345 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8346 }
8347 }
8348 }
8349 else
8350 {
8351 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8352 {
8353 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8354 }
8355 else
8356 {
8357 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8358 }
8359 }
7808 break; 8360 break;
7809 8361
7810 case (int)ScriptBaseClass.PRIM_POINT_LIGHT: 8362 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
@@ -7823,13 +8375,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7823 break; 8375 break;
7824 8376
7825 case (int)ScriptBaseClass.PRIM_GLOW: 8377 case (int)ScriptBaseClass.PRIM_GLOW:
7826 // TODO--------------
7827 if (remain < 1) 8378 if (remain < 1)
7828 return res; 8379 return res;
8380 face = (int)rules.GetLSLIntegerItem(idx++);
7829 8381
7830 face=(int)rules.GetLSLIntegerItem(idx++); 8382 tex = part.Shape.Textures;
7831 8383 float primglow;
7832 res.Add(new LSL_Float(0)); 8384 if (face == ScriptBaseClass.ALL_SIDES)
8385 {
8386 for (face = 0; face < GetNumberOfSides(part); face++)
8387 {
8388 primglow = tex.GetFace((uint)face).Glow;
8389 res.Add(new LSL_Float(primglow));
8390 }
8391 }
8392 else
8393 {
8394 primglow = tex.GetFace((uint)face).Glow;
8395 res.Add(new LSL_Float(primglow));
8396 }
7833 break; 8397 break;
7834 case (int)ScriptBaseClass.PRIM_TEXT: 8398 case (int)ScriptBaseClass.PRIM_TEXT:
7835 Color4 textColor = part.GetTextColor(); 8399 Color4 textColor = part.GetTextColor();
@@ -8379,8 +8943,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8379 // The function returns an ordered list 8943 // The function returns an ordered list
8380 // representing the tokens found in the supplied 8944 // representing the tokens found in the supplied
8381 // sources string. If two successive tokenizers 8945 // sources string. If two successive tokenizers
8382 // are encountered, then a NULL entry is added 8946 // are encountered, then a null-string entry is
8383 // to the list. 8947 // added to the list.
8384 // 8948 //
8385 // It is a precondition that the source and 8949 // It is a precondition that the source and
8386 // toekizer lisst are non-null. If they are null, 8950 // toekizer lisst are non-null. If they are null,
@@ -8388,7 +8952,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8388 // while their lengths are being determined. 8952 // while their lengths are being determined.
8389 // 8953 //
8390 // A small amount of working memoryis required 8954 // A small amount of working memoryis required
8391 // of approximately 8*#tokenizers. 8955 // of approximately 8*#tokenizers + 8*srcstrlen.
8392 // 8956 //
8393 // There are many ways in which this function 8957 // There are many ways in which this function
8394 // can be implemented, this implementation is 8958 // can be implemented, this implementation is
@@ -8404,155 +8968,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8404 // and eliminates redundant tokenizers as soon 8968 // and eliminates redundant tokenizers as soon
8405 // as is possible. 8969 // as is possible.
8406 // 8970 //
8407 // The implementation tries to avoid any copying 8971 // The implementation tries to minimize temporary
8408 // of arrays or other objects. 8972 // garbage generation.
8409 // </remarks> 8973 // </remarks>
8410 8974
8411 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 8975 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8412 { 8976 {
8413 int beginning = 0; 8977 return ParseString2List(src, separators, spacers, true);
8414 int srclen = src.Length; 8978 }
8415 int seplen = separators.Length;
8416 object[] separray = separators.Data;
8417 int spclen = spacers.Length;
8418 object[] spcarray = spacers.Data;
8419 int mlen = seplen+spclen;
8420
8421 int[] offset = new int[mlen+1];
8422 bool[] active = new bool[mlen];
8423
8424 int best;
8425 int j;
8426
8427 // Initial capacity reduces resize cost
8428 8979
8429 LSL_List tokens = new LSL_List(); 8980 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
8981 {
8982 int srclen = src.Length;
8983 int seplen = separators.Length;
8984 object[] separray = separators.Data;
8985 int spclen = spacers.Length;
8986 object[] spcarray = spacers.Data;
8987 int dellen = 0;
8988 string[] delarray = new string[seplen+spclen];
8430 8989
8431 // All entries are initially valid 8990 int outlen = 0;
8991 string[] outarray = new string[srclen*2+1];
8432 8992
8433 for (int i = 0; i < mlen; i++) 8993 int i, j;
8434 active[i] = true; 8994 string d;
8435 8995
8436 offset[mlen] = srclen; 8996 m_host.AddScriptLPS(1);
8437 8997
8438 while (beginning < srclen) 8998 /*
8999 * Convert separator and spacer lists to C# strings.
9000 * Also filter out null strings so we don't hang.
9001 */
9002 for (i = 0; i < seplen; i ++)
8439 { 9003 {
9004 d = separray[i].ToString();
9005 if (d.Length > 0)
9006 {
9007 delarray[dellen++] = d;
9008 }
9009 }
9010 seplen = dellen;
8440 9011
8441 best = mlen; // as bad as it gets 9012 for (i = 0; i < spclen; i ++)
9013 {
9014 d = spcarray[i].ToString();
9015 if (d.Length > 0)
9016 {
9017 delarray[dellen++] = d;
9018 }
9019 }
8442 9020
8443 // Scan for separators 9021 /*
9022 * Scan through source string from beginning to end.
9023 */
9024 for (i = 0;;)
9025 {
8444 9026
8445 for (j = 0; j < seplen; j++) 9027 /*
9028 * Find earliest delimeter in src starting at i (if any).
9029 */
9030 int earliestDel = -1;
9031 int earliestSrc = srclen;
9032 string earliestStr = null;
9033 for (j = 0; j < dellen; j ++)
8446 { 9034 {
8447 if (separray[j].ToString() == String.Empty) 9035 d = delarray[j];
8448 active[j] = false; 9036 if (d != null)
8449
8450 if (active[j])
8451 { 9037 {
8452 // scan all of the markers 9038 int index = src.IndexOf(d, i);
8453 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9039 if (index < 0)
8454 { 9040 {
8455 // not present at all 9041 delarray[j] = null; // delim nowhere in src, don't check it anymore
8456 active[j] = false;
8457 } 9042 }
8458 else 9043 else if (index < earliestSrc)
8459 { 9044 {
8460 // present and correct 9045 earliestSrc = index; // where delimeter starts in source string
8461 if (offset[j] < offset[best]) 9046 earliestDel = j; // where delimeter is in delarray[]
8462 { 9047 earliestStr = d; // the delimeter string from delarray[]
8463 // closest so far 9048 if (index == i) break; // can't do any better than found at beg of string
8464 best = j;
8465 if (offset[best] == beginning)
8466 break;
8467 }
8468 } 9049 }
8469 } 9050 }
8470 } 9051 }
8471 9052
8472 // Scan for spacers 9053 /*
8473 9054 * Output source string starting at i through start of earliest delimeter.
8474 if (offset[best] != beginning) 9055 */
9056 if (keepNulls || (earliestSrc > i))
8475 { 9057 {
8476 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9058 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8477 {
8478 if (spcarray[j-seplen].ToString() == String.Empty)
8479 active[j] = false;
8480
8481 if (active[j])
8482 {
8483 // scan all of the markers
8484 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
8485 {
8486 // not present at all
8487 active[j] = false;
8488 }
8489 else
8490 {
8491 // present and correct
8492 if (offset[j] < offset[best])
8493 {
8494 // closest so far
8495 best = j;
8496 }
8497 }
8498 }
8499 }
8500 } 9059 }
8501 9060
8502 // This is the normal exit from the scanning loop 9061 /*
9062 * If no delimeter found at or after i, we're done scanning.
9063 */
9064 if (earliestDel < 0) break;
8503 9065
8504 if (best == mlen) 9066 /*
9067 * If delimeter was a spacer, output the spacer.
9068 */
9069 if (earliestDel >= seplen)
8505 { 9070 {
8506 // no markers were found on this pass 9071 outarray[outlen++] = earliestStr;
8507 // so we're pretty much done
8508 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
8509 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8510 break;
8511 } 9072 }
8512 9073
8513 // Otherwise we just add the newly delimited token 9074 /*
8514 // and recalculate where the search should continue. 9075 * Look at rest of src string following delimeter.
8515 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9076 */
8516 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9077 i = earliestSrc + earliestStr.Length;
8517
8518 if (best < seplen)
8519 {
8520 beginning = offset[best] + (separray[best].ToString()).Length;
8521 }
8522 else
8523 {
8524 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8525 string str = spcarray[best - seplen].ToString();
8526 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
8527 tokens.Add(new LSL_String(str));
8528 }
8529 } 9078 }
8530 9079
8531 // This an awkward an not very intuitive boundary case. If the 9080 /*
8532 // last substring is a tokenizer, then there is an implied trailing 9081 * Make up an exact-sized output array suitable for an LSL_List object.
8533 // null list entry. Hopefully the single comparison will not be too 9082 */
8534 // arduous. Alternatively the 'break' could be replced with a return 9083 object[] outlist = new object[outlen];
8535 // but that's shabby programming. 9084 for (i = 0; i < outlen; i ++)
8536
8537 if ((beginning == srclen) && (keepNulls))
8538 { 9085 {
8539 if (srclen != 0) 9086 outlist[i] = new LSL_String(outarray[i]);
8540 tokens.Add(new LSL_String(""));
8541 } 9087 }
8542 9088 return new LSL_List(outlist);
8543 return tokens;
8544 }
8545
8546 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
8547 {
8548 m_host.AddScriptLPS(1);
8549 return this.ParseString(src, separators, spacers, false);
8550 }
8551
8552 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8553 {
8554 m_host.AddScriptLPS(1);
8555 return this.ParseString(src, separators, spacers, true);
8556 } 9089 }
8557 9090
8558 public LSL_Integer llGetObjectPermMask(int mask) 9091 public LSL_Integer llGetObjectPermMask(int mask)
@@ -8629,28 +9162,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8629 { 9162 {
8630 m_host.AddScriptLPS(1); 9163 m_host.AddScriptLPS(1);
8631 9164
8632 lock (m_host.TaskInventory) 9165 m_host.TaskInventory.LockItemsForRead(true);
9166 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8633 { 9167 {
8634 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9168 if (inv.Value.Name == item)
8635 { 9169 {
8636 if (inv.Value.Name == item) 9170 m_host.TaskInventory.LockItemsForRead(false);
9171 switch (mask)
8637 { 9172 {
8638 switch (mask) 9173 case 0:
8639 { 9174 return (int)inv.Value.BasePermissions;
8640 case 0: 9175 case 1:
8641 return (int)inv.Value.BasePermissions; 9176 return (int)inv.Value.CurrentPermissions;
8642 case 1: 9177 case 2:
8643 return (int)inv.Value.CurrentPermissions; 9178 return (int)inv.Value.GroupPermissions;
8644 case 2: 9179 case 3:
8645 return (int)inv.Value.GroupPermissions; 9180 return (int)inv.Value.EveryonePermissions;
8646 case 3: 9181 case 4:
8647 return (int)inv.Value.EveryonePermissions; 9182 return (int)inv.Value.NextPermissions;
8648 case 4:
8649 return (int)inv.Value.NextPermissions;
8650 }
8651 } 9183 }
8652 } 9184 }
8653 } 9185 }
9186 m_host.TaskInventory.LockItemsForRead(false);
8654 9187
8655 return -1; 9188 return -1;
8656 } 9189 }
@@ -8697,16 +9230,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8697 { 9230 {
8698 m_host.AddScriptLPS(1); 9231 m_host.AddScriptLPS(1);
8699 9232
8700 lock (m_host.TaskInventory) 9233 m_host.TaskInventory.LockItemsForRead(true);
9234 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8701 { 9235 {
8702 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9236 if (inv.Value.Name == item)
8703 { 9237 {
8704 if (inv.Value.Name == item) 9238 m_host.TaskInventory.LockItemsForRead(false);
8705 { 9239 return inv.Value.CreatorID.ToString();
8706 return inv.Value.CreatorID.ToString();
8707 }
8708 } 9240 }
8709 } 9241 }
9242 m_host.TaskInventory.LockItemsForRead(false);
8710 9243
8711 llSay(0, "No item name '" + item + "'"); 9244 llSay(0, "No item name '" + item + "'");
8712 9245
@@ -8971,17 +9504,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8971 int width = 0; 9504 int width = 0;
8972 int height = 0; 9505 int height = 0;
8973 9506
8974 ParcelMediaCommandEnum? commandToSend = null; 9507 uint commandToSend = 0;
8975 float time = 0.0f; // default is from start 9508 float time = 0.0f; // default is from start
8976 9509
8977 ScenePresence presence = null; 9510 ScenePresence presence = null;
8978 9511
8979 for (int i = 0; i < commandList.Data.Length; i++) 9512 for (int i = 0; i < commandList.Data.Length; i++)
8980 { 9513 {
8981 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 9514 uint command = (uint)(commandList.GetLSLIntegerItem(i));
8982 switch (command) 9515 switch (command)
8983 { 9516 {
8984 case ParcelMediaCommandEnum.Agent: 9517 case (uint)ParcelMediaCommandEnum.Agent:
8985 // we send only to one agent 9518 // we send only to one agent
8986 if ((i + 1) < commandList.Length) 9519 if ((i + 1) < commandList.Length)
8987 { 9520 {
@@ -8998,25 +9531,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8998 } 9531 }
8999 break; 9532 break;
9000 9533
9001 case ParcelMediaCommandEnum.Loop: 9534 case (uint)ParcelMediaCommandEnum.Loop:
9002 loop = 1; 9535 loop = 1;
9003 commandToSend = command; 9536 commandToSend = command;
9004 update = true; //need to send the media update packet to set looping 9537 update = true; //need to send the media update packet to set looping
9005 break; 9538 break;
9006 9539
9007 case ParcelMediaCommandEnum.Play: 9540 case (uint)ParcelMediaCommandEnum.Play:
9008 loop = 0; 9541 loop = 0;
9009 commandToSend = command; 9542 commandToSend = command;
9010 update = true; //need to send the media update packet to make sure it doesn't loop 9543 update = true; //need to send the media update packet to make sure it doesn't loop
9011 break; 9544 break;
9012 9545
9013 case ParcelMediaCommandEnum.Pause: 9546 case (uint)ParcelMediaCommandEnum.Pause:
9014 case ParcelMediaCommandEnum.Stop: 9547 case (uint)ParcelMediaCommandEnum.Stop:
9015 case ParcelMediaCommandEnum.Unload: 9548 case (uint)ParcelMediaCommandEnum.Unload:
9016 commandToSend = command; 9549 commandToSend = command;
9017 break; 9550 break;
9018 9551
9019 case ParcelMediaCommandEnum.Url: 9552 case (uint)ParcelMediaCommandEnum.Url:
9020 if ((i + 1) < commandList.Length) 9553 if ((i + 1) < commandList.Length)
9021 { 9554 {
9022 if (commandList.Data[i + 1] is LSL_String) 9555 if (commandList.Data[i + 1] is LSL_String)
@@ -9029,7 +9562,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9029 } 9562 }
9030 break; 9563 break;
9031 9564
9032 case ParcelMediaCommandEnum.Texture: 9565 case (uint)ParcelMediaCommandEnum.Texture:
9033 if ((i + 1) < commandList.Length) 9566 if ((i + 1) < commandList.Length)
9034 { 9567 {
9035 if (commandList.Data[i + 1] is LSL_String) 9568 if (commandList.Data[i + 1] is LSL_String)
@@ -9042,7 +9575,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9042 } 9575 }
9043 break; 9576 break;
9044 9577
9045 case ParcelMediaCommandEnum.Time: 9578 case (uint)ParcelMediaCommandEnum.Time:
9046 if ((i + 1) < commandList.Length) 9579 if ((i + 1) < commandList.Length)
9047 { 9580 {
9048 if (commandList.Data[i + 1] is LSL_Float) 9581 if (commandList.Data[i + 1] is LSL_Float)
@@ -9054,7 +9587,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9054 } 9587 }
9055 break; 9588 break;
9056 9589
9057 case ParcelMediaCommandEnum.AutoAlign: 9590 case (uint)ParcelMediaCommandEnum.AutoAlign:
9058 if ((i + 1) < commandList.Length) 9591 if ((i + 1) < commandList.Length)
9059 { 9592 {
9060 if (commandList.Data[i + 1] is LSL_Integer) 9593 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9068,7 +9601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9068 } 9601 }
9069 break; 9602 break;
9070 9603
9071 case ParcelMediaCommandEnum.Type: 9604 case (uint)ParcelMediaCommandEnum.Type:
9072 if ((i + 1) < commandList.Length) 9605 if ((i + 1) < commandList.Length)
9073 { 9606 {
9074 if (commandList.Data[i + 1] is LSL_String) 9607 if (commandList.Data[i + 1] is LSL_String)
@@ -9081,7 +9614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9081 } 9614 }
9082 break; 9615 break;
9083 9616
9084 case ParcelMediaCommandEnum.Desc: 9617 case (uint)ParcelMediaCommandEnum.Desc:
9085 if ((i + 1) < commandList.Length) 9618 if ((i + 1) < commandList.Length)
9086 { 9619 {
9087 if (commandList.Data[i + 1] is LSL_String) 9620 if (commandList.Data[i + 1] is LSL_String)
@@ -9094,7 +9627,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9094 } 9627 }
9095 break; 9628 break;
9096 9629
9097 case ParcelMediaCommandEnum.Size: 9630 case (uint)ParcelMediaCommandEnum.Size:
9098 if ((i + 2) < commandList.Length) 9631 if ((i + 2) < commandList.Length)
9099 { 9632 {
9100 if (commandList.Data[i + 1] is LSL_Integer) 9633 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9164,7 +9697,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9164 } 9697 }
9165 } 9698 }
9166 9699
9167 if (commandToSend != null) 9700 if (commandToSend != 0)
9168 { 9701 {
9169 // the commandList contained a start/stop/... command, too 9702 // the commandList contained a start/stop/... command, too
9170 if (presence == null) 9703 if (presence == null)
@@ -9201,7 +9734,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9201 9734
9202 if (aList.Data[i] != null) 9735 if (aList.Data[i] != null)
9203 { 9736 {
9204 switch ((ParcelMediaCommandEnum) aList.Data[i]) 9737 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
9205 { 9738 {
9206 case ParcelMediaCommandEnum.Url: 9739 case ParcelMediaCommandEnum.Url:
9207 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 9740 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -9244,16 +9777,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9244 { 9777 {
9245 m_host.AddScriptLPS(1); 9778 m_host.AddScriptLPS(1);
9246 9779
9247 lock (m_host.TaskInventory) 9780 m_host.TaskInventory.LockItemsForRead(true);
9781 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9248 { 9782 {
9249 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9783 if (inv.Value.Name == name)
9250 { 9784 {
9251 if (inv.Value.Name == name) 9785 m_host.TaskInventory.LockItemsForRead(false);
9252 { 9786 return inv.Value.Type;
9253 return inv.Value.Type;
9254 }
9255 } 9787 }
9256 } 9788 }
9789 m_host.TaskInventory.LockItemsForRead(false);
9257 9790
9258 return -1; 9791 return -1;
9259 } 9792 }
@@ -9264,15 +9797,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9264 9797
9265 if (quick_pay_buttons.Data.Length < 4) 9798 if (quick_pay_buttons.Data.Length < 4)
9266 { 9799 {
9267 LSLError("List must have at least 4 elements"); 9800 int x;
9268 return; 9801 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
9802 {
9803 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
9804 }
9269 } 9805 }
9270 m_host.ParentGroup.RootPart.PayPrice[0]=price; 9806 int[] nPrice = new int[5];
9271 9807 nPrice[0]=price;
9272 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 9808 nPrice[1] = (LSL_Integer)quick_pay_buttons.Data[0];
9273 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 9809 nPrice[2] = (LSL_Integer)quick_pay_buttons.Data[1];
9274 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 9810 nPrice[3] = (LSL_Integer)quick_pay_buttons.Data[2];
9275 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 9811 nPrice[4] = (LSL_Integer)quick_pay_buttons.Data[3];
9812 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9276 m_host.ParentGroup.HasGroupChanged = true; 9813 m_host.ParentGroup.HasGroupChanged = true;
9277 } 9814 }
9278 9815
@@ -9284,17 +9821,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9284 if (invItemID == UUID.Zero) 9821 if (invItemID == UUID.Zero)
9285 return new LSL_Vector(); 9822 return new LSL_Vector();
9286 9823
9287 lock (m_host.TaskInventory) 9824 m_host.TaskInventory.LockItemsForRead(true);
9825 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9288 { 9826 {
9289 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9827 m_host.TaskInventory.LockItemsForRead(false);
9290 return new LSL_Vector(); 9828 return new LSL_Vector();
9829 }
9291 9830
9292 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9831 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9293 { 9832 {
9294 ShoutError("No permissions to track the camera"); 9833 ShoutError("No permissions to track the camera");
9295 return new LSL_Vector(); 9834 m_host.TaskInventory.LockItemsForRead(false);
9296 } 9835 return new LSL_Vector();
9297 } 9836 }
9837 m_host.TaskInventory.LockItemsForRead(false);
9298 9838
9299 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9839 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9300 if (presence != null) 9840 if (presence != null)
@@ -9312,17 +9852,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9312 if (invItemID == UUID.Zero) 9852 if (invItemID == UUID.Zero)
9313 return new LSL_Rotation(); 9853 return new LSL_Rotation();
9314 9854
9315 lock (m_host.TaskInventory) 9855 m_host.TaskInventory.LockItemsForRead(true);
9856 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9316 { 9857 {
9317 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9858 m_host.TaskInventory.LockItemsForRead(false);
9318 return new LSL_Rotation(); 9859 return new LSL_Rotation();
9319
9320 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9321 {
9322 ShoutError("No permissions to track the camera");
9323 return new LSL_Rotation();
9324 }
9325 } 9860 }
9861 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9862 {
9863 ShoutError("No permissions to track the camera");
9864 m_host.TaskInventory.LockItemsForRead(false);
9865 return new LSL_Rotation();
9866 }
9867 m_host.TaskInventory.LockItemsForRead(false);
9326 9868
9327 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9869 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9328 if (presence != null) 9870 if (presence != null)
@@ -9384,8 +9926,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9384 { 9926 {
9385 m_host.AddScriptLPS(1); 9927 m_host.AddScriptLPS(1);
9386 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 9928 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9387 if (detectedParams == null) return; // only works on the first detected avatar 9929 if (detectedParams == null)
9388 9930 {
9931 if (m_host.IsAttachment == true)
9932 {
9933 detectedParams = new DetectParams();
9934 detectedParams.Key = m_host.OwnerID;
9935 }
9936 else
9937 {
9938 return;
9939 }
9940 }
9941
9389 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 9942 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9390 if (avatar != null) 9943 if (avatar != null)
9391 { 9944 {
@@ -9393,6 +9946,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9393 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 9946 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9394 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 9947 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9395 } 9948 }
9949
9396 ScriptSleep(1000); 9950 ScriptSleep(1000);
9397 } 9951 }
9398 9952
@@ -9472,14 +10026,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9472 if (objectID == UUID.Zero) return; 10026 if (objectID == UUID.Zero) return;
9473 10027
9474 UUID agentID; 10028 UUID agentID;
9475 lock (m_host.TaskInventory) 10029 m_host.TaskInventory.LockItemsForRead(true);
9476 { 10030 // we need the permission first, to know which avatar we want to set the camera for
9477 // we need the permission first, to know which avatar we want to set the camera for 10031 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9478 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9479 10032
9480 if (agentID == UUID.Zero) return; 10033 if (agentID == UUID.Zero)
9481 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10034 {
10035 m_host.TaskInventory.LockItemsForRead(false);
10036 return;
9482 } 10037 }
10038 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10039 {
10040 m_host.TaskInventory.LockItemsForRead(false);
10041 return;
10042 }
10043 m_host.TaskInventory.LockItemsForRead(false);
9483 10044
9484 ScenePresence presence = World.GetScenePresence(agentID); 10045 ScenePresence presence = World.GetScenePresence(agentID);
9485 10046
@@ -9488,12 +10049,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9488 10049
9489 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10050 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
9490 object[] data = rules.Data; 10051 object[] data = rules.Data;
9491 for (int i = 0; i < data.Length; ++i) { 10052 for (int i = 0; i < data.Length; ++i)
10053 {
9492 int type = Convert.ToInt32(data[i++].ToString()); 10054 int type = Convert.ToInt32(data[i++].ToString());
9493 if (i >= data.Length) break; // odd number of entries => ignore the last 10055 if (i >= data.Length) break; // odd number of entries => ignore the last
9494 10056
9495 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10057 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
9496 switch (type) { 10058 switch (type)
10059 {
9497 case ScriptBaseClass.CAMERA_FOCUS: 10060 case ScriptBaseClass.CAMERA_FOCUS:
9498 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10061 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
9499 case ScriptBaseClass.CAMERA_POSITION: 10062 case ScriptBaseClass.CAMERA_POSITION:
@@ -9529,12 +10092,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9529 10092
9530 // we need the permission first, to know which avatar we want to clear the camera for 10093 // we need the permission first, to know which avatar we want to clear the camera for
9531 UUID agentID; 10094 UUID agentID;
9532 lock (m_host.TaskInventory) 10095 m_host.TaskInventory.LockItemsForRead(true);
10096 agentID = m_host.TaskInventory[invItemID].PermsGranter;
10097 if (agentID == UUID.Zero)
9533 { 10098 {
9534 agentID = m_host.TaskInventory[invItemID].PermsGranter; 10099 m_host.TaskInventory.LockItemsForRead(false);
9535 if (agentID == UUID.Zero) return; 10100 return;
9536 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10101 }
10102 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10103 {
10104 m_host.TaskInventory.LockItemsForRead(false);
10105 return;
9537 } 10106 }
10107 m_host.TaskInventory.LockItemsForRead(false);
9538 10108
9539 ScenePresence presence = World.GetScenePresence(agentID); 10109 ScenePresence presence = World.GetScenePresence(agentID);
9540 10110
@@ -9601,19 +10171,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9601 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 10171 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
9602 { 10172 {
9603 m_host.AddScriptLPS(1); 10173 m_host.AddScriptLPS(1);
9604 string ret = String.Empty; 10174
9605 string src1 = llBase64ToString(str1); 10175 if (str1 == String.Empty)
9606 string src2 = llBase64ToString(str2); 10176 return String.Empty;
9607 int c = 0; 10177 if (str2 == String.Empty)
9608 for (int i = 0; i < src1.Length; i++) 10178 return str1;
10179
10180 byte[] data1;
10181 byte[] data2;
10182 try
10183 {
10184 data1 = Convert.FromBase64String(str1);
10185 data2 = Convert.FromBase64String(str2);
10186 }
10187 catch (Exception)
9609 { 10188 {
9610 ret += (char) (src1[i] ^ src2[c]); 10189 return new LSL_String(String.Empty);
10190 }
9611 10191
9612 c++; 10192 byte[] d2 = new Byte[data1.Length];
9613 if (c >= src2.Length) 10193 int pos = 0;
9614 c = 0; 10194
10195 if (data1.Length <= data2.Length)
10196 {
10197 Array.Copy(data2, 0, d2, 0, data1.Length);
9615 } 10198 }
9616 return llStringToBase64(ret); 10199 else
10200 {
10201 while (pos < data1.Length)
10202 {
10203 int len = data1.Length - pos;
10204 if (len > data2.Length)
10205 len = data2.Length;
10206
10207 Array.Copy(data2, 0, d2, pos, len);
10208 pos += len;
10209 }
10210 }
10211
10212 for (pos = 0 ; pos < data1.Length ; pos++ )
10213 data1[pos] ^= d2[pos];
10214
10215 return Convert.ToBase64String(data1);
9617 } 10216 }
9618 10217
9619 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 10218 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -9672,12 +10271,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9672 Regex r = new Regex(authregex); 10271 Regex r = new Regex(authregex);
9673 int[] gnums = r.GetGroupNumbers(); 10272 int[] gnums = r.GetGroupNumbers();
9674 Match m = r.Match(url); 10273 Match m = r.Match(url);
9675 if (m.Success) { 10274 if (m.Success)
9676 for (int i = 1; i < gnums.Length; i++) { 10275 {
10276 for (int i = 1; i < gnums.Length; i++)
10277 {
9677 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 10278 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
9678 //CaptureCollection cc = g.Captures; 10279 //CaptureCollection cc = g.Captures;
9679 } 10280 }
9680 if (m.Groups.Count == 5) { 10281 if (m.Groups.Count == 5)
10282 {
9681 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 10283 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
9682 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 10284 url = m.Groups[1].ToString() + m.Groups[4].ToString();
9683 } 10285 }
@@ -9994,15 +10596,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9994 10596
9995 internal UUID ScriptByName(string name) 10597 internal UUID ScriptByName(string name)
9996 { 10598 {
9997 lock (m_host.TaskInventory) 10599 m_host.TaskInventory.LockItemsForRead(true);
10600
10601 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
9998 { 10602 {
9999 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 10603 if (item.Type == 10 && item.Name == name)
10000 { 10604 {
10001 if (item.Type == 10 && item.Name == name) 10605 m_host.TaskInventory.LockItemsForRead(false);
10002 return item.ItemID; 10606 return item.ItemID;
10003 } 10607 }
10004 } 10608 }
10005 10609
10610 m_host.TaskInventory.LockItemsForRead(false);
10611
10006 return UUID.Zero; 10612 return UUID.Zero;
10007 } 10613 }
10008 10614
@@ -10043,6 +10649,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10043 { 10649 {
10044 m_host.AddScriptLPS(1); 10650 m_host.AddScriptLPS(1);
10045 10651
10652 //Clone is thread safe
10046 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10653 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10047 10654
10048 UUID assetID = UUID.Zero; 10655 UUID assetID = UUID.Zero;
@@ -10105,6 +10712,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10105 { 10712 {
10106 m_host.AddScriptLPS(1); 10713 m_host.AddScriptLPS(1);
10107 10714
10715 //Clone is thread safe
10108 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10716 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10109 10717
10110 UUID assetID = UUID.Zero; 10718 UUID assetID = UUID.Zero;
@@ -10184,6 +10792,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10184 10792
10185 return GetLinkPrimitiveParams(obj, rules); 10793 return GetLinkPrimitiveParams(obj, rules);
10186 } 10794 }
10795
10796 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
10797 {
10798 List<SceneObjectPart> parts = GetLinkParts(link);
10799 if (parts.Count < 1)
10800 return 0;
10801
10802 return GetNumberOfSides(parts[0]);
10803 }
10187 } 10804 }
10188 10805
10189 public class NotecardCache 10806 public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index fc92f23..26ef0dd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
129 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 129 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
130 internal float m_ScriptDelayFactor = 1.0f; 130 internal float m_ScriptDelayFactor = 1.0f;
131 internal float m_ScriptDistanceFactor = 1.0f; 131 internal float m_ScriptDistanceFactor = 1.0f;
132 internal bool m_debuggerSafe = false;
132 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 133 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
133 134
134 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) 135 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -137,6 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
137 m_host = host; 138 m_host = host;
138 m_localID = localID; 139 m_localID = localID;
139 m_itemID = itemID; 140 m_itemID = itemID;
141 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
140 142
141 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) 143 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
142 m_OSFunctionsEnabled = true; 144 m_OSFunctionsEnabled = true;
@@ -195,7 +197,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
195 197
196 internal void OSSLError(string msg) 198 internal void OSSLError(string msg)
197 { 199 {
198 throw new Exception("OSSL Runtime Error: " + msg); 200 if (m_debuggerSafe)
201 {
202 OSSLShoutError(msg);
203 }
204 else
205 {
206 throw new Exception("OSSL Runtime Error: " + msg);
207 }
199 } 208 }
200 209
201 private void InitLSL() 210 private void InitLSL()
@@ -799,18 +808,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
799 if (target != null) 808 if (target != null)
800 { 809 {
801 UUID animID=UUID.Zero; 810 UUID animID=UUID.Zero;
802 lock (m_host.TaskInventory) 811 m_host.TaskInventory.LockItemsForRead(true);
812 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
803 { 813 {
804 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 814 if (inv.Value.Name == animation)
805 { 815 {
806 if (inv.Value.Name == animation) 816 if (inv.Value.Type == (int)AssetType.Animation)
807 { 817 animID = inv.Value.AssetID;
808 if (inv.Value.Type == (int)AssetType.Animation) 818 continue;
809 animID = inv.Value.AssetID;
810 continue;
811 }
812 } 819 }
813 } 820 }
821 m_host.TaskInventory.LockItemsForRead(false);
814 if (animID == UUID.Zero) 822 if (animID == UUID.Zero)
815 target.Animator.AddAnimation(animation, m_host.UUID); 823 target.Animator.AddAnimation(animation, m_host.UUID);
816 else 824 else
@@ -832,18 +840,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
832 if (target != null) 840 if (target != null)
833 { 841 {
834 UUID animID=UUID.Zero; 842 UUID animID=UUID.Zero;
835 lock (m_host.TaskInventory) 843 m_host.TaskInventory.LockItemsForRead(true);
844 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
836 { 845 {
837 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 846 if (inv.Value.Name == animation)
838 { 847 {
839 if (inv.Value.Name == animation) 848 if (inv.Value.Type == (int)AssetType.Animation)
840 { 849 animID = inv.Value.AssetID;
841 if (inv.Value.Type == (int)AssetType.Animation) 850 continue;
842 animID = inv.Value.AssetID;
843 continue;
844 }
845 } 851 }
846 } 852 }
853 m_host.TaskInventory.LockItemsForRead(false);
847 854
848 if (animID == UUID.Zero) 855 if (animID == UUID.Zero)
849 target.Animator.RemoveAnimation(animation); 856 target.Animator.RemoveAnimation(animation);
@@ -1694,6 +1701,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1694 1701
1695 if (!UUID.TryParse(name, out assetID)) 1702 if (!UUID.TryParse(name, out assetID))
1696 { 1703 {
1704 m_host.TaskInventory.LockItemsForRead(true);
1697 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1705 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1698 { 1706 {
1699 if (item.Type == 7 && item.Name == name) 1707 if (item.Type == 7 && item.Name == name)
@@ -1701,6 +1709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1701 assetID = item.AssetID; 1709 assetID = item.AssetID;
1702 } 1710 }
1703 } 1711 }
1712 m_host.TaskInventory.LockItemsForRead(false);
1704 } 1713 }
1705 1714
1706 if (assetID == UUID.Zero) 1715 if (assetID == UUID.Zero)
@@ -1747,6 +1756,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1747 1756
1748 if (!UUID.TryParse(name, out assetID)) 1757 if (!UUID.TryParse(name, out assetID))
1749 { 1758 {
1759 m_host.TaskInventory.LockItemsForRead(true);
1750 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1760 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1751 { 1761 {
1752 if (item.Type == 7 && item.Name == name) 1762 if (item.Type == 7 && item.Name == name)
@@ -1754,6 +1764,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1754 assetID = item.AssetID; 1764 assetID = item.AssetID;
1755 } 1765 }
1756 } 1766 }
1767 m_host.TaskInventory.LockItemsForRead(false);
1757 } 1768 }
1758 1769
1759 if (assetID == UUID.Zero) 1770 if (assetID == UUID.Zero)
@@ -1804,6 +1815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1804 1815
1805 if (!UUID.TryParse(name, out assetID)) 1816 if (!UUID.TryParse(name, out assetID))
1806 { 1817 {
1818 m_host.TaskInventory.LockItemsForRead(true);
1807 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1819 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1808 { 1820 {
1809 if (item.Type == 7 && item.Name == name) 1821 if (item.Type == 7 && item.Name == name)
@@ -1811,6 +1823,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1811 assetID = item.AssetID; 1823 assetID = item.AssetID;
1812 } 1824 }
1813 } 1825 }
1826 m_host.TaskInventory.LockItemsForRead(false);
1814 } 1827 }
1815 1828
1816 if (assetID == UUID.Zero) 1829 if (assetID == UUID.Zero)
@@ -2290,9 +2303,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2290 { 2303 {
2291 if (avatar.IsChildAgent == false) 2304 if (avatar.IsChildAgent == false)
2292 { 2305 {
2293 result.Add(avatar.UUID); 2306 result.Add(new LSL_Key(avatar.UUID.ToString()));
2294 result.Add(avatar.AbsolutePosition); 2307 result.Add(new LSL_Vector(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z));
2295 result.Add(avatar.Name); 2308 result.Add(new LSL_String(avatar.Name));
2296 } 2309 }
2297 } 2310 }
2298 }); 2311 });
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index fefbb35..3b7de53 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
204 // Is the sensor type is AGENT and not SCRIPTED then include agents 204 // Is the sensor type is AGENT and not SCRIPTED then include agents
205 if ((ts.type & AGENT) != 0 && (ts.type & SCRIPTED) == 0) 205 if ((ts.type & AGENT) != 0 && (ts.type & SCRIPTED) == 0)
206 { 206 {
207 sensedEntities.AddRange(doAgentSensor(ts)); 207 sensedEntities.AddRange(doAgentSensor(ts));
208 } 208 }
209 209
210 // If SCRIPTED or PASSIVE or ACTIVE check objects 210 // If SCRIPTED or PASSIVE or ACTIVE check objects
@@ -309,6 +309,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
309 // in mouselook. 309 // in mouselook.
310 310
311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar); 311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
312 fromRegionPos = avatar.AbsolutePosition;
312 q = avatar.Rotation; 313 q = avatar.Rotation;
313 } 314 }
314 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 315 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -422,6 +423,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
422 SceneObjectPart SensePoint = ts.host; 423 SceneObjectPart SensePoint = ts.host;
423 Vector3 fromRegionPos = SensePoint.AbsolutePosition; 424 Vector3 fromRegionPos = SensePoint.AbsolutePosition;
424 Quaternion q = SensePoint.RotationOffset; 425 Quaternion q = SensePoint.RotationOffset;
426 if (SensePoint.ParentGroup.RootPart.IsAttachment)
427 {
428 // In attachments, the sensor cone always orients with the
429 // avatar rotation. This may include a nonzero elevation if
430 // in mouselook.
431
432 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
433 fromRegionPos = avatar.AbsolutePosition;
434 q = avatar.Rotation;
435 }
425 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 436 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
426 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r); 437 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
427 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); 438 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index eeb59d9..2fd33fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -109,25 +109,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
109 if (Timers.Count == 0) 109 if (Timers.Count == 0)
110 return; 110 return;
111 111
112 Dictionary<string, TimerClass>.ValueCollection tvals;
112 lock (TimerListLock) 113 lock (TimerListLock)
113 { 114 {
114 // Go through all timers 115 // Go through all timers
115 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 116 tvals = Timers.Values;
116 foreach (TimerClass ts in tvals) 117 }
118
119 foreach (TimerClass ts in tvals)
120 {
121 // Time has passed?
122 if (ts.next < DateTime.Now.Ticks)
117 { 123 {
118 // Time has passed? 124 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
119 if (ts.next < DateTime.Now.Ticks) 125 // Add it to queue
120 { 126 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
121 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 127 new EventParams("timer", new Object[0],
122 // Add it to queue 128 new DetectParams[0]));
123 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 129 // set next interval
124 new EventParams("timer", new Object[0], 130
125 new DetectParams[0])); 131 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
126 // set next interval 132 ts.next = DateTime.Now.Ticks + ts.interval;
127
128 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
129 ts.next = DateTime.Now.Ticks + ts.interval;
130 }
131 } 133 }
132 } 134 }
133 } 135 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 561e3b3..bae7d4b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -398,6 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
398 LSL_Vector llWind(LSL_Vector offset); 398 LSL_Vector llWind(LSL_Vector offset);
399 LSL_String llXorBase64Strings(string str1, string str2); 399 LSL_String llXorBase64Strings(string str1, string str2);
400 LSL_String llXorBase64StringsCorrect(string str1, string str2); 400 LSL_String llXorBase64StringsCorrect(string str1, string str2);
401 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
401 402
402 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 403 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
403 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 404 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 10d61ca..961987d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
81 // Avatar Info Commands 81 // Avatar Info Commands
82 string osGetAgentIP(string agent); 82 string osGetAgentIP(string agent);
83 LSL_List osGetAgents(); 83 LSL_List osGetAgents();
84 84
85 // Teleport commands 85 // Teleport commands
86 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 86 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
87 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 87 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 9615315..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Reflection; 31using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -132,6 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
132 return (eventFlags); 133 return (eventFlags);
133 } 134 }
134 135
136 [DebuggerNonUserCode]
135 public void ExecuteEvent(string state, string FunctionName, object[] args) 137 public void ExecuteEvent(string state, string FunctionName, object[] args)
136 { 138 {
137 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. 139 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index b3c4d95..93d544b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -279,6 +279,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
279 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 279 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
280 public const int CHANGED_MEDIA = 2048; 280 public const int CHANGED_MEDIA = 2048;
281 public const int CHANGED_ANIMATION = 16384; 281 public const int CHANGED_ANIMATION = 16384;
282 public const int CHANGED_POSITION = 32768;
282 public const int TYPE_INVALID = 0; 283 public const int TYPE_INVALID = 0;
283 public const int TYPE_INTEGER = 1; 284 public const int TYPE_INTEGER = 1;
284 public const int TYPE_FLOAT = 2; 285 public const int TYPE_FLOAT = 2;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 451163f..7c26824 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -309,6 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
309 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 310 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
310 } 311 }
311 312
313 [DebuggerNonUserCode]
312 public void llDie() 314 public void llDie()
313 { 315 {
314 m_LSL_Functions.llDie(); 316 m_LSL_Functions.llDie();
@@ -1847,5 +1849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1847 { 1849 {
1848 return m_LSL_Functions.llClearPrimMedia(face); 1850 return m_LSL_Functions.llClearPrimMedia(face);
1849 } 1851 }
1852
1853 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1854 {
1855 return m_LSL_Functions.llGetLinkNumberOfSides(link);
1856 }
1850 } 1857 }
1851} 1858}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 143b497..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
72 { 72 {
73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
74 } 74 }
75
75 public void lsClearWindlightScene() 76 public void lsClearWindlightScene()
76 { 77 {
77 m_LS_Functions.lsClearWindlightScene(); 78 m_LS_Functions.lsClearWindlightScene();
78 } 79 }
80
81 public LSL_List cmGetWindlightScene(LSL_List rules)
82 {
83 return m_LS_Functions.lsGetWindlightScene(rules);
84 }
85
86 public int cmSetWindlightScene(LSL_List rules)
87 {
88 return m_LS_Functions.lsSetWindlightScene(rules);
89 }
90
91 public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
92 {
93 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
94 }
95
96 public void cmClearWindlightScene()
97 {
98 m_LS_Functions.lsClearWindlightScene();
99 }
79 } 100 }
80} 101}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
33using System.Reflection; 33using System.Reflection;
34using System.Collections; 34using System.Collections;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Diagnostics; //for [DebuggerNonUserCode]
36using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 39using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
90 return (int)m_Executor.GetStateEventFlags(state); 91 return (int)m_Executor.GetStateEventFlags(state);
91 } 92 }
92 93
94 [DebuggerNonUserCode]
93 public void ExecuteEvent(string state, string FunctionName, object[] args) 95 public void ExecuteEvent(string state, string FunctionName, object[] args)
94 { 96 {
95 m_Executor.ExecuteEvent(state, FunctionName, args); 97 m_Executor.ExecuteEvent(state, FunctionName, args);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6663aa5..623cb7d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Runtime.Remoting; 31using System.Runtime.Remoting;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Threading; 33using System.Threading;
@@ -55,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
55{ 56{
56 public class ScriptInstance : MarshalByRefObject, IScriptInstance 57 public class ScriptInstance : MarshalByRefObject, IScriptInstance
57 { 58 {
58 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 60
60 private IScriptEngine m_Engine; 61 private IScriptEngine m_Engine;
61 private IScriptWorkItem m_CurrentResult = null; 62 private IScriptWorkItem m_CurrentResult = null;
@@ -238,13 +239,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
238 239
239 if (part != null) 240 if (part != null)
240 { 241 {
241 lock (part.TaskInventory) 242 part.TaskInventory.LockItemsForRead(true);
243 if (part.TaskInventory.ContainsKey(m_ItemID))
242 { 244 {
243 if (part.TaskInventory.ContainsKey(m_ItemID)) 245 m_thisScriptTask = part.TaskInventory[m_ItemID];
244 {
245 m_thisScriptTask = part.TaskInventory[m_ItemID];
246 }
247 } 246 }
247 part.TaskInventory.LockItemsForRead(false);
248 } 248 }
249 249
250 ApiManager am = new ApiManager(); 250 ApiManager am = new ApiManager();
@@ -271,9 +271,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
271 //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); 271 //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
272// lease.Register(this); 272// lease.Register(this);
273 } 273 }
274 catch (Exception) 274 catch (Exception e)
275 { 275 {
276 // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); 276 m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
277 throw;
277 } 278 }
278 279
279 try 280 try
@@ -429,14 +430,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
429 { 430 {
430 int permsMask; 431 int permsMask;
431 UUID permsGranter; 432 UUID permsGranter;
432 lock (part.TaskInventory) 433 part.TaskInventory.LockItemsForRead(true);
434 if (!part.TaskInventory.ContainsKey(m_ItemID))
433 { 435 {
434 if (!part.TaskInventory.ContainsKey(m_ItemID)) 436 part.TaskInventory.LockItemsForRead(false);
435 return; 437 return;
436
437 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
438 permsMask = part.TaskInventory[m_ItemID].PermsMask;
439 } 438 }
439 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
440 permsMask = part.TaskInventory[m_ItemID].PermsMask;
441 part.TaskInventory.LockItemsForRead(false);
440 442
441 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 443 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
442 { 444 {
@@ -545,6 +547,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
545 return true; 547 return true;
546 } 548 }
547 549
550 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
548 public void SetState(string state) 551 public void SetState(string state)
549 { 552 {
550 if (state == State) 553 if (state == State)
@@ -556,7 +559,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
556 new DetectParams[0])); 559 new DetectParams[0]));
557 PostEvent(new EventParams("state_entry", new Object[0], 560 PostEvent(new EventParams("state_entry", new Object[0],
558 new DetectParams[0])); 561 new DetectParams[0]));
559 562
560 throw new EventAbortException(); 563 throw new EventAbortException();
561 } 564 }
562 565
@@ -639,14 +642,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
639 /// <returns></returns> 642 /// <returns></returns>
640 public object EventProcessor() 643 public object EventProcessor()
641 { 644 {
642 if (m_Suspended) 645 EventParams data = null;
643 return 0;
644 646
645 lock (m_Script) 647 lock (m_EventQueue)
646 { 648 {
647 EventParams data = null; 649 if (m_Suspended)
650 return 0;
648 651
649 lock (m_EventQueue) 652 lock (m_Script)
650 { 653 {
651 data = (EventParams) m_EventQueue.Dequeue(); 654 data = (EventParams) m_EventQueue.Dequeue();
652 if (data == null) // Shouldn't happen 655 if (data == null) // Shouldn't happen
@@ -672,6 +675,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
672 if (data.EventName == "collision") 675 if (data.EventName == "collision")
673 m_CollisionInQueue = false; 676 m_CollisionInQueue = false;
674 } 677 }
678 }
679 lock(m_Script)
680 {
675 681
676 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); 682 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
677 683
@@ -828,6 +834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
828 new Object[0], new DetectParams[0])); 834 new Object[0], new DetectParams[0]));
829 } 835 }
830 836
837 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
831 public void ApiResetScript() 838 public void ApiResetScript()
832 { 839 {
833 // bool running = Running; 840 // bool running = Running;
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 91e03ac..a3a2fdf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -83,19 +83,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
83 83
84 public override string ToString() 84 public override string ToString()
85 { 85 {
86 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z); 86 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
87 return s; 87 return s;
88 } 88 }
89 89
90 public static explicit operator LSLString(Vector3 vec) 90 public static explicit operator LSLString(Vector3 vec)
91 { 91 {
92 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 92 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
93 return new LSLString(s); 93 return new LSLString(s);
94 } 94 }
95 95
96 public static explicit operator string(Vector3 vec) 96 public static explicit operator string(Vector3 vec)
97 { 97 {
98 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 98 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
99 return s; 99 return s;
100 } 100 }
101 101
@@ -342,19 +342,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
342 342
343 public override string ToString() 343 public override string ToString()
344 { 344 {
345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s); 345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s);
346 return st; 346 return st;
347 } 347 }
348 348
349 public static explicit operator string(Quaternion r) 349 public static explicit operator string(Quaternion r)
350 { 350 {
351 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 351 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
352 return s; 352 return s;
353 } 353 }
354 354
355 public static explicit operator LSLString(Quaternion r) 355 public static explicit operator LSLString(Quaternion r)
356 { 356 {
357 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 357 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
358 return new LSLString(s); 358 return new LSLString(s);
359 } 359 }
360 360
@@ -613,24 +613,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
613 613
614 public static bool operator ==(list a, list b) 614 public static bool operator ==(list a, list b)
615 { 615 {
616 int la = -1; 616 int la = a.Length;
617 int lb = -1; 617 int lb = b.Length;
618 try { la = a.Length; }
619 catch (NullReferenceException) { }
620 try { lb = b.Length; }
621 catch (NullReferenceException) { }
622 618
623 return la == lb; 619 return la == lb;
624 } 620 }
625 621
626 public static bool operator !=(list a, list b) 622 public static bool operator !=(list a, list b)
627 { 623 {
628 int la = -1; 624 int la = a.Length;
629 int lb = -1; 625 int lb = b.Length;
630 try { la = a.Length; }
631 catch (NullReferenceException) { }
632 try {lb = b.Length;}
633 catch (NullReferenceException) { }
634 626
635 return la != lb; 627 return la != lb;
636 } 628 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 8629674..35cc65b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -30,6 +30,7 @@ using System.IO;
30using System.Threading; 30using System.Threading;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Diagnostics; //for [DebuggerNonUserCode]
33using System.Security; 34using System.Security;
34using System.Security.Policy; 35using System.Security.Policy;
35using System.Reflection; 36using System.Reflection;
@@ -103,6 +104,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
103 private Dictionary<UUID, IScriptInstance> m_Scripts = 104 private Dictionary<UUID, IScriptInstance> m_Scripts =
104 new Dictionary<UUID, IScriptInstance>(); 105 new Dictionary<UUID, IScriptInstance>();
105 106
107 private OpenMetaverse.ReaderWriterLockSlim m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
108
106 // Maps the asset ID to the assembly 109 // Maps the asset ID to the assembly
107 110
108 private Dictionary<UUID, string> m_Assemblies = 111 private Dictionary<UUID, string> m_Assemblies =
@@ -125,6 +128,71 @@ namespace OpenSim.Region.ScriptEngine.XEngine
125 IWorkItemResult m_CurrentCompile = null; 128 IWorkItemResult m_CurrentCompile = null;
126 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); 129 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
127 130
131 private void lockScriptsForRead(bool locked)
132 {
133 if (locked)
134 {
135 if (m_scriptsLock.RecursiveReadCount > 0)
136 {
137 m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
138 m_scriptsLock.ExitReadLock();
139 }
140 if (m_scriptsLock.RecursiveWriteCount > 0)
141 {
142 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
143 m_scriptsLock.ExitWriteLock();
144 }
145
146 while (!m_scriptsLock.TryEnterReadLock(60000))
147 {
148 m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire READ lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
149 if (m_scriptsLock.IsWriteLockHeld)
150 {
151 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
152 }
153 }
154 }
155 else
156 {
157 if (m_scriptsLock.RecursiveReadCount > 0)
158 {
159 m_scriptsLock.ExitReadLock();
160 }
161 }
162 }
163 private void lockScriptsForWrite(bool locked)
164 {
165 if (locked)
166 {
167 if (m_scriptsLock.RecursiveReadCount > 0)
168 {
169 m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
170 m_scriptsLock.ExitReadLock();
171 }
172 if (m_scriptsLock.RecursiveWriteCount > 0)
173 {
174 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
175 m_scriptsLock.ExitWriteLock();
176 }
177
178 while (!m_scriptsLock.TryEnterWriteLock(60000))
179 {
180 m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire WRITE lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
181 if (m_scriptsLock.IsWriteLockHeld)
182 {
183 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
184 }
185 }
186 }
187 else
188 {
189 if (m_scriptsLock.RecursiveWriteCount > 0)
190 {
191 m_scriptsLock.ExitWriteLock();
192 }
193 }
194 }
195
128 public string ScriptEngineName 196 public string ScriptEngineName
129 { 197 {
130 get { return "XEngine"; } 198 get { return "XEngine"; }
@@ -270,43 +338,45 @@ namespace OpenSim.Region.ScriptEngine.XEngine
270 338
271 public void RemoveRegion(Scene scene) 339 public void RemoveRegion(Scene scene)
272 { 340 {
273 lock (m_Scripts) 341 lockScriptsForRead(true);
342 foreach (IScriptInstance instance in m_Scripts.Values)
274 { 343 {
275 foreach (IScriptInstance instance in m_Scripts.Values) 344 // Force a final state save
345 //
346 if (m_Assemblies.ContainsKey(instance.AssetID))
276 { 347 {
277 // Force a final state save 348 string assembly = m_Assemblies[instance.AssetID];
278 // 349 instance.SaveState(assembly);
279 if (m_Assemblies.ContainsKey(instance.AssetID)) 350 }
280 {
281 string assembly = m_Assemblies[instance.AssetID];
282 instance.SaveState(assembly);
283 }
284 351
285 // Clear the event queue and abort the instance thread 352 // Clear the event queue and abort the instance thread
286 // 353 //
287 instance.ClearQueue(); 354 instance.ClearQueue();
288 instance.Stop(0); 355 instance.Stop(0);
289 356
290 // Release events, timer, etc 357 // Release events, timer, etc
291 // 358 //
292 instance.DestroyScriptInstance(); 359 instance.DestroyScriptInstance();
293 360
294 // Unload scripts and app domains 361 // Unload scripts and app domains
295 // Must be done explicitly because they have infinite 362 // Must be done explicitly because they have infinite
296 // lifetime 363 // lifetime
297 // 364 //
298 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID); 365 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
299 if (m_DomainScripts[instance.AppDomain].Count == 0) 366 if (m_DomainScripts[instance.AppDomain].Count == 0)
300 { 367 {
301 m_DomainScripts.Remove(instance.AppDomain); 368 m_DomainScripts.Remove(instance.AppDomain);
302 UnloadAppDomain(instance.AppDomain); 369 UnloadAppDomain(instance.AppDomain);
303 }
304 } 370 }
305 m_Scripts.Clear();
306 m_PrimObjects.Clear();
307 m_Assemblies.Clear();
308 m_DomainScripts.Clear();
309 } 371 }
372 lockScriptsForRead(false);
373 lockScriptsForWrite(true);
374 m_Scripts.Clear();
375 lockScriptsForWrite(false);
376 m_PrimObjects.Clear();
377 m_Assemblies.Clear();
378 m_DomainScripts.Clear();
379
310 lock (m_ScriptEngines) 380 lock (m_ScriptEngines)
311 { 381 {
312 m_ScriptEngines.Remove(this); 382 m_ScriptEngines.Remove(this);
@@ -365,22 +435,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
365 435
366 List<IScriptInstance> instances = new List<IScriptInstance>(); 436 List<IScriptInstance> instances = new List<IScriptInstance>();
367 437
368 lock (m_Scripts) 438 lockScriptsForRead(true);
369 { 439 foreach (IScriptInstance instance in m_Scripts.Values)
370 foreach (IScriptInstance instance in m_Scripts.Values)
371 instances.Add(instance); 440 instances.Add(instance);
372 } 441 lockScriptsForRead(false);
373 442
374 foreach (IScriptInstance i in instances) 443 foreach (IScriptInstance i in instances)
375 { 444 {
376 string assembly = String.Empty; 445 string assembly = String.Empty;
377 446
378 lock (m_Scripts) 447
379 {
380 if (!m_Assemblies.ContainsKey(i.AssetID)) 448 if (!m_Assemblies.ContainsKey(i.AssetID))
381 continue; 449 continue;
382 assembly = m_Assemblies[i.AssetID]; 450 assembly = m_Assemblies[i.AssetID];
383 } 451
384 452
385 i.SaveState(assembly); 453 i.SaveState(assembly);
386 } 454 }
@@ -709,92 +777,95 @@ namespace OpenSim.Region.ScriptEngine.XEngine
709 } 777 }
710 778
711 ScriptInstance instance = null; 779 ScriptInstance instance = null;
712 lock (m_Scripts) 780 // Create the object record
781 lockScriptsForRead(true);
782 if ((!m_Scripts.ContainsKey(itemID)) ||
783 (m_Scripts[itemID].AssetID != assetID))
713 { 784 {
714 // Create the object record 785 lockScriptsForRead(false);
715 786
716 if ((!m_Scripts.ContainsKey(itemID)) || 787 UUID appDomain = assetID;
717 (m_Scripts[itemID].AssetID != assetID))
718 {
719 UUID appDomain = assetID;
720 788
721 if (part.ParentGroup.IsAttachment) 789 if (part.ParentGroup.IsAttachment)
722 appDomain = part.ParentGroup.RootPart.UUID; 790 appDomain = part.ParentGroup.RootPart.UUID;
723 791
724 if (!m_AppDomains.ContainsKey(appDomain)) 792 if (!m_AppDomains.ContainsKey(appDomain))
793 {
794 try
725 { 795 {
726 try 796 AppDomainSetup appSetup = new AppDomainSetup();
727 { 797 appSetup.PrivateBinPath = Path.Combine(
728 AppDomainSetup appSetup = new AppDomainSetup(); 798 m_ScriptEnginesPath,
729 appSetup.PrivateBinPath = Path.Combine( 799 m_Scene.RegionInfo.RegionID.ToString());
730 m_ScriptEnginesPath, 800
731 m_Scene.RegionInfo.RegionID.ToString()); 801 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
732 802 Evidence evidence = new Evidence(baseEvidence);
733 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; 803
734 Evidence evidence = new Evidence(baseEvidence); 804 AppDomain sandbox;
735 805 if (m_AppDomainLoading)
736 AppDomain sandbox; 806 sandbox = AppDomain.CreateDomain(
737 if (m_AppDomainLoading) 807 m_Scene.RegionInfo.RegionID.ToString(),
738 sandbox = AppDomain.CreateDomain( 808 evidence, appSetup);
739 m_Scene.RegionInfo.RegionID.ToString(), 809 else
740 evidence, appSetup); 810 sandbox = AppDomain.CurrentDomain;
741 else 811
742 sandbox = AppDomain.CurrentDomain; 812 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
743 813 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
744 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); 814 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
745 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); 815 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
746 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); 816 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
747 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet); 817 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
748 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement); 818 //sandbox.SetAppDomainPolicy(sandboxPolicy);
749 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup; 819
750 //sandbox.SetAppDomainPolicy(sandboxPolicy); 820 m_AppDomains[appDomain] = sandbox;
751 821
752 m_AppDomains[appDomain] = sandbox; 822 m_AppDomains[appDomain].AssemblyResolve +=
753 823 new ResolveEventHandler(
754 m_AppDomains[appDomain].AssemblyResolve += 824 AssemblyResolver.OnAssemblyResolve);
755 new ResolveEventHandler( 825 m_DomainScripts[appDomain] = new List<UUID>();
756 AssemblyResolver.OnAssemblyResolve); 826 }
757 m_DomainScripts[appDomain] = new List<UUID>(); 827 catch (Exception e)
758 } 828 {
759 catch (Exception e) 829 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
830 m_ScriptErrorMessage += "Exception creating app domain:\n";
831 m_ScriptFailCount++;
832 lock (m_AddingAssemblies)
760 { 833 {
761 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); 834 m_AddingAssemblies[assembly]--;
762 m_ScriptErrorMessage += "Exception creating app domain:\n";
763 m_ScriptFailCount++;
764 lock (m_AddingAssemblies)
765 {
766 m_AddingAssemblies[assembly]--;
767 }
768 return false;
769 } 835 }
836 return false;
770 } 837 }
771 m_DomainScripts[appDomain].Add(itemID); 838 }
772 839 m_DomainScripts[appDomain].Add(itemID);
773 instance = new ScriptInstance(this, part, 840
774 itemID, assetID, assembly, 841 instance = new ScriptInstance(this, part,
775 m_AppDomains[appDomain], 842 itemID, assetID, assembly,
776 part.ParentGroup.RootPart.Name, 843 m_AppDomains[appDomain],
777 item.Name, startParam, postOnRez, 844 part.ParentGroup.RootPart.Name,
778 stateSource, m_MaxScriptQueue); 845 item.Name, startParam, postOnRez,
779 846 stateSource, m_MaxScriptQueue);
780 m_log.DebugFormat( 847
848 m_log.DebugFormat(
781 "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", 849 "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
782 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 850 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,
783 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); 851 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
784 852
785 if (presence != null) 853 if (presence != null)
786 { 854 {
787 ShowScriptSaveResponse(item.OwnerID, 855 ShowScriptSaveResponse(item.OwnerID,
788 assetID, "Compile successful", true); 856 assetID, "Compile successful", true);
789 }
790
791 instance.AppDomain = appDomain;
792 instance.LineMap = linemap;
793
794 m_Scripts[itemID] = instance;
795 } 857 }
796 }
797 858
859 instance.AppDomain = appDomain;
860 instance.LineMap = linemap;
861 lockScriptsForWrite(true);
862 m_Scripts[itemID] = instance;
863 lockScriptsForWrite(false);
864 }
865 else
866 {
867 lockScriptsForRead(false);
868 }
798 lock (m_PrimObjects) 869 lock (m_PrimObjects)
799 { 870 {
800 if (!m_PrimObjects.ContainsKey(localID)) 871 if (!m_PrimObjects.ContainsKey(localID))
@@ -813,9 +884,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
813 m_AddingAssemblies[assembly]--; 884 m_AddingAssemblies[assembly]--;
814 } 885 }
815 886
816 if (instance != null) 887 if (instance!=null)
817 instance.Init(); 888 instance.Init();
818 889
819 return true; 890 return true;
820 } 891 }
821 892
@@ -828,20 +899,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
828 m_CompileDict.Remove(itemID); 899 m_CompileDict.Remove(itemID);
829 } 900 }
830 901
831 IScriptInstance instance = null; 902 lockScriptsForRead(true);
832 903 // Do we even have it?
833 lock (m_Scripts) 904 if (!m_Scripts.ContainsKey(itemID))
834 { 905 {
835 // Do we even have it? 906 lockScriptsForRead(false);
836 if (!m_Scripts.ContainsKey(itemID)) 907 return;
837 return;
838
839 instance=m_Scripts[itemID];
840 m_Scripts.Remove(itemID);
841 } 908 }
909
842 910
911 IScriptInstance instance=m_Scripts[itemID];
912 lockScriptsForRead(false);
913 lockScriptsForWrite(true);
914 m_Scripts.Remove(itemID);
915 lockScriptsForWrite(false);
843 instance.ClearQueue(); 916 instance.ClearQueue();
844 instance.Stop(0); 917 instance.Stop(0);
918
845// bool objectRemoved = false; 919// bool objectRemoved = false;
846 920
847 lock (m_PrimObjects) 921 lock (m_PrimObjects)
@@ -877,11 +951,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
877 ObjectRemoved handlerObjectRemoved = OnObjectRemoved; 951 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
878 if (handlerObjectRemoved != null) 952 if (handlerObjectRemoved != null)
879 { 953 {
880 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); 954 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
881 handlerObjectRemoved(part.UUID); 955 handlerObjectRemoved(part.UUID);
882 } 956 }
883 957
884 958 CleanAssemblies();
959
885 ScriptRemoved handlerScriptRemoved = OnScriptRemoved; 960 ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
886 if (handlerScriptRemoved != null) 961 if (handlerScriptRemoved != null)
887 handlerScriptRemoved(itemID); 962 handlerScriptRemoved(itemID);
@@ -1023,7 +1098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1023 return false; 1098 return false;
1024 1099
1025 uuids = m_PrimObjects[localID]; 1100 uuids = m_PrimObjects[localID];
1026 } 1101
1027 1102
1028 foreach (UUID itemID in uuids) 1103 foreach (UUID itemID in uuids)
1029 { 1104 {
@@ -1041,6 +1116,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1041 result = true; 1116 result = true;
1042 } 1117 }
1043 } 1118 }
1119 }
1044 1120
1045 return result; 1121 return result;
1046 } 1122 }
@@ -1140,12 +1216,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1140 private IScriptInstance GetInstance(UUID itemID) 1216 private IScriptInstance GetInstance(UUID itemID)
1141 { 1217 {
1142 IScriptInstance instance; 1218 IScriptInstance instance;
1143 lock (m_Scripts) 1219 lockScriptsForRead(true);
1220 if (!m_Scripts.ContainsKey(itemID))
1144 { 1221 {
1145 if (!m_Scripts.ContainsKey(itemID)) 1222 lockScriptsForRead(false);
1146 return null; 1223 return null;
1147 instance = m_Scripts[itemID];
1148 } 1224 }
1225 instance = m_Scripts[itemID];
1226 lockScriptsForRead(false);
1149 return instance; 1227 return instance;
1150 } 1228 }
1151 1229
@@ -1169,6 +1247,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1169 return false; 1247 return false;
1170 } 1248 }
1171 1249
1250 [DebuggerNonUserCode]
1172 public void ApiResetScript(UUID itemID) 1251 public void ApiResetScript(UUID itemID)
1173 { 1252 {
1174 IScriptInstance instance = GetInstance(itemID); 1253 IScriptInstance instance = GetInstance(itemID);
@@ -1220,6 +1299,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1220 return UUID.Zero; 1299 return UUID.Zero;
1221 } 1300 }
1222 1301
1302 [DebuggerNonUserCode]
1223 public void SetState(UUID itemID, string newState) 1303 public void SetState(UUID itemID, string newState)
1224 { 1304 {
1225 IScriptInstance instance = GetInstance(itemID); 1305 IScriptInstance instance = GetInstance(itemID);
@@ -1240,11 +1320,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1240 { 1320 {
1241 List<IScriptInstance> instances = new List<IScriptInstance>(); 1321 List<IScriptInstance> instances = new List<IScriptInstance>();
1242 1322
1243 lock (m_Scripts) 1323 lockScriptsForRead(true);
1244 { 1324 foreach (IScriptInstance instance in m_Scripts.Values)
1245 foreach (IScriptInstance instance in m_Scripts.Values)
1246 instances.Add(instance); 1325 instances.Add(instance);
1247 } 1326 lockScriptsForRead(false);
1248 1327
1249 foreach (IScriptInstance i in instances) 1328 foreach (IScriptInstance i in instances)
1250 { 1329 {
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 23ae5b4..456b6fc 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset
408 408
409 byte[] HandlePurgeFolder(Dictionary<string,object> request) 409 byte[] HandlePurgeFolder(Dictionary<string,object> request)
410 { 410 {
411
411 Dictionary<string,object> result = new Dictionary<string,object>(); 412 Dictionary<string,object> result = new Dictionary<string,object>();
412 UUID folderID = UUID.Zero; 413 UUID folderID = UUID.Zero;
413 UUID.TryParse(request["ID"].ToString(), out folderID); 414 UUID.TryParse(request["ID"].ToString(), out folderID);
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 1f7e502..26516ab 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -110,6 +110,11 @@ namespace OpenSim.Server.Handlers.Simulation
110 DoAgentDelete(request, responsedata, agentID, action, regionID); 110 DoAgentDelete(request, responsedata, agentID, action, regionID);
111 return responsedata; 111 return responsedata;
112 } 112 }
113 else if (method.Equals("DELETECHILD"))
114 {
115 DoChildAgentDelete(request, responsedata, agentID, action, regionID);
116 return responsedata;
117 }
113 else 118 else
114 { 119 {
115 m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method); 120 m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method);
@@ -352,6 +357,24 @@ namespace OpenSim.Server.Handlers.Simulation
352 } 357 }
353 } 358 }
354 359
360 protected void DoChildAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
361 {
362 m_log.Debug(" >>> DoChildAgentDelete action:" + action + "; RegionID:" + regionID);
363
364 GridRegion destination = new GridRegion();
365 destination.RegionID = regionID;
366
367 if (action.Equals("release"))
368 ReleaseAgent(regionID, id);
369 else
370 m_SimulationService.CloseChildAgent(destination, id);
371
372 responsedata["int_response_code"] = HttpStatusCode.OK;
373 responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
374
375 m_log.Debug("[AGENT HANDLER]: Child Agent Released/Deleted.");
376 }
377
355 protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) 378 protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
356 { 379 {
357 m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID); 380 m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 470a4dd..3122382 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -144,7 +144,10 @@ namespace OpenSim.Services.AssetService
144 public string Store(AssetBase asset) 144 public string Store(AssetBase asset)
145 { 145 {
146 //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID); 146 //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID);
147 m_Database.StoreAsset(asset); 147 if (!m_Database.StoreAsset(asset))
148 {
149 return UUID.Zero.ToString();
150 }
148 151
149 return asset.ID; 152 return asset.ID;
150 } 153 }
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 65b3537..ad18a23 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -30,6 +30,7 @@ using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Timers;
33using Nini.Config; 34using Nini.Config;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
@@ -48,7 +49,9 @@ namespace OpenSim.Services.Connectors
48 49
49 private string m_ServerURI = String.Empty; 50 private string m_ServerURI = String.Empty;
50 private IImprovedAssetCache m_Cache = null; 51 private IImprovedAssetCache m_Cache = null;
51 52 private int m_retryCounter;
53 private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
54 private Timer m_retryTimer;
52 public AssetServicesConnector() 55 public AssetServicesConnector()
53 { 56 {
54 } 57 }
@@ -85,6 +88,55 @@ namespace OpenSim.Services.Connectors
85 MainConsole.Instance.Commands.AddCommand("asset", false, "dump asset", 88 MainConsole.Instance.Commands.AddCommand("asset", false, "dump asset",
86 "dump asset <id> <file>", 89 "dump asset <id> <file>",
87 "dump one cached asset", HandleDumpAsset); 90 "dump one cached asset", HandleDumpAsset);
91
92 m_retryTimer = new Timer();
93 m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
94 m_retryTimer.Interval = 60000;
95 }
96
97 protected void retryCheck(object source, ElapsedEventArgs e)
98 {
99 m_retryCounter++;
100 if (m_retryCounter > 60) m_retryCounter -= 60;
101 List<int> keys = new List<int>();
102 foreach (int a in m_retryQueue.Keys)
103 {
104 keys.Add(a);
105 }
106 foreach (int a in keys)
107 {
108 //We exponentially fall back on frequency until we reach one attempt per hour
109 //The net result is that we end up in the queue for roughly 24 hours..
110 //24 hours worth of assets could be a lot, so the hope is that the region admin
111 //will have gotten the asset connector back online quickly!
112
113 int timefactor = a ^ 2;
114 if (timefactor > 60)
115 {
116 timefactor = 60;
117 }
118
119 //First, find out if we care about this timefactor
120 if (timefactor % a == 0)
121 {
122 //Yes, we do!
123 List<AssetBase> retrylist = m_retryQueue[a];
124 m_retryQueue.Remove(a);
125
126 foreach(AssetBase ass in retrylist)
127 {
128 Store(ass); //Store my ass. This function will put it back in the dictionary if it fails
129 }
130 }
131 }
132
133 if (m_retryQueue.Count == 0)
134 {
135 //It might only be one tick per minute, but I have
136 //repented and abandoned my wasteful ways
137 m_retryCounter = 0;
138 m_retryTimer.Stop();
139 }
88 } 140 }
89 141
90 protected void SetCache(IImprovedAssetCache cache) 142 protected void SetCache(IImprovedAssetCache cache)
@@ -99,8 +151,8 @@ namespace OpenSim.Services.Connectors
99 AssetBase asset = null; 151 AssetBase asset = null;
100 if (m_Cache != null) 152 if (m_Cache != null)
101 asset = m_Cache.Get(id); 153 asset = m_Cache.Get(id);
102 154
103 if (asset == null) 155 if (asset == null || asset.Data == null || asset.Data.Length == 0)
104 { 156 {
105 asset = SynchronousRestObjectRequester. 157 asset = SynchronousRestObjectRequester.
106 MakeRequest<int, AssetBase>("GET", uri, 0); 158 MakeRequest<int, AssetBase>("GET", uri, 0);
@@ -177,7 +229,7 @@ namespace OpenSim.Services.Connectors
177 if (m_Cache != null) 229 if (m_Cache != null)
178 asset = m_Cache.Get(id); 230 asset = m_Cache.Get(id);
179 231
180 if (asset == null) 232 if (asset == null || asset.Data == null || asset.Data.Length == 0)
181 { 233 {
182 bool result = false; 234 bool result = false;
183 235
@@ -204,11 +256,10 @@ namespace OpenSim.Services.Connectors
204 256
205 public string Store(AssetBase asset) 257 public string Store(AssetBase asset)
206 { 258 {
259 if (m_Cache != null)
260 m_Cache.Cache(asset);
207 if (asset.Temporary || asset.Local) 261 if (asset.Temporary || asset.Local)
208 { 262 {
209 if (m_Cache != null)
210 m_Cache.Cache(asset);
211
212 return asset.ID; 263 return asset.ID;
213 } 264 }
214 265
@@ -218,24 +269,57 @@ namespace OpenSim.Services.Connectors
218 try 269 try
219 { 270 {
220 newID = SynchronousRestObjectRequester. 271 newID = SynchronousRestObjectRequester.
221 MakeRequest<AssetBase, string>("POST", uri, asset); 272 MakeRequest<AssetBase, string>("POST", uri, asset, 25);
273 if (newID == null || newID == "")
274 {
275 newID = UUID.Zero.ToString();
276 }
222 } 277 }
223 catch (Exception e) 278 catch (Exception e)
224 { 279 {
225 m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message); 280 newID = UUID.Zero.ToString();
226 } 281 }
227 282
228 if (newID != String.Empty) 283 if (newID == UUID.Zero.ToString())
229 { 284 {
230 // Placing this here, so that this work with old asset servers that don't send any reply back 285 //The asset upload failed, put it in a queue for later
231 // SynchronousRestObjectRequester returns somethins that is not an empty string 286 asset.UploadAttempts++;
232 if (newID != null) 287 if (asset.UploadAttempts > 30)
233 asset.ID = newID; 288 {
234 289 //By this stage we've been in the queue for a good few hours;
235 if (m_Cache != null) 290 //We're going to drop the asset.
236 m_Cache.Cache(asset); 291 m_log.ErrorFormat("[Assets] Dropping asset {0} - Upload has been in the queue for too long.", asset.ID.ToString());
292 }
293 else
294 {
295 if (!m_retryQueue.ContainsKey(asset.UploadAttempts))
296 {
297 m_retryQueue.Add(asset.UploadAttempts, new List<AssetBase>());
298 }
299 List<AssetBase> m_queue = m_retryQueue[asset.UploadAttempts];
300 m_queue.Add(asset);
301 m_log.WarnFormat("[Assets] Upload failed: {0} - Requeuing asset for another run.", asset.ID.ToString());
302 m_retryTimer.Start();
303 }
304 }
305 else
306 {
307 if (asset.UploadAttempts > 0)
308 {
309 m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString());
310 }
311 if (newID != String.Empty)
312 {
313 // Placing this here, so that this work with old asset servers that don't send any reply back
314 // SynchronousRestObjectRequester returns somethins that is not an empty string
315 if (newID != null)
316 asset.ID = newID;
317
318 if (m_Cache != null)
319 m_Cache.Cache(asset);
320 }
237 } 321 }
238 return newID; 322 return asset.ID;
239 } 323 }
240 324
241 public bool UpdateContent(string id, byte[] data) 325 public bool UpdateContent(string id, byte[] data)
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
index 8143b5a..539b2cc 100644
--- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
@@ -132,4 +132,4 @@ namespace OpenSim.Services.Connectors
132 return landData; 132 return landData;
133 } 133 }
134 } 134 }
135} \ No newline at end of file 135}
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index 41ebeaf..f1c99ce 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -300,6 +300,17 @@ namespace OpenSim.Services.Connectors
300 { 300 {
301 pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]); 301 pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]);
302 } 302 }
303 else
304 {
305 if (replyData["result"].ToString() == "null")
306 return null;
307
308 m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString());
309 }
310 }
311 else
312 {
313 m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply received from presence server when querying for sessionID {0}", sessionID.ToString());
303 } 314 }
304 315
305 return pinfo; 316 return pinfo;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 168b233..4fc2a6d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -135,6 +135,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
135 135
136 public string RegisterRegion(UUID scopeID, GridRegion regionInfo) 136 public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
137 { 137 {
138 IPEndPoint ext = regionInfo.ExternalEndPoint;
139 if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint";
138 // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service 140 // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service
139 Scene scene; 141 Scene scene;
140 if (m_scenes.TryGetValue(regionInfo.RegionID, out scene)) 142 if (m_scenes.TryGetValue(regionInfo.RegionID, out scene))
@@ -152,7 +154,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
152 { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, 154 { "ServerURI", OSD.FromString(regionInfo.ServerURI) },
153 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, 155 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) },
154 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, 156 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) },
155 { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) }, 157 { "ExternalAddress", OSD.FromString(ext.Address.ToString()) },
156 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, 158 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) },
157 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, 159 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) },
158 { "Access", OSD.FromInteger(regionInfo.Access) }, 160 { "Access", OSD.FromInteger(regionInfo.Access) },
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 67647ee..1730b95 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -383,7 +383,9 @@ namespace OpenSim.Services.Connectors.Simulation
383 383
384 public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) 384 public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
385 { 385 {
386 IPEndPoint ext = destination.ExternalEndPoint;
386 agent = null; 387 agent = null;
388 if (ext == null) return false;
387 // Eventually, we want to use a caps url instead of the agentID 389 // Eventually, we want to use a caps url instead of the agentID
388 string uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; 390 string uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
389 //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); 391 //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri);
@@ -477,7 +479,7 @@ namespace OpenSim.Services.Connectors.Simulation
477 return true; 479 return true;
478 } 480 }
479 481
480 public bool CloseAgent(GridRegion destination, UUID id) 482 private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
481 { 483 {
482 string uri = string.Empty; 484 string uri = string.Empty;
483 try 485 try
@@ -494,6 +496,8 @@ namespace OpenSim.Services.Connectors.Simulation
494 496
495 WebRequest request = WebRequest.Create(uri); 497 WebRequest request = WebRequest.Create(uri);
496 request.Method = "DELETE"; 498 request.Method = "DELETE";
499 if (ChildOnly)
500 request.Method += "CHILD";
497 request.Timeout = 10000; 501 request.Timeout = 10000;
498 502
499 StreamReader sr = null; 503 StreamReader sr = null;
@@ -526,6 +530,16 @@ namespace OpenSim.Services.Connectors.Simulation
526 return true; 530 return true;
527 } 531 }
528 532
533 public bool CloseChildAgent(GridRegion destination, UUID id)
534 {
535 return CloseAgent(destination, id, true);
536 }
537
538 public bool CloseAgent(GridRegion destination, UUID id)
539 {
540 return CloseAgent(destination, id, false);
541 }
542
529 #endregion Agents 543 #endregion Agents
530 544
531 #region Objects 545 #region Objects
@@ -537,6 +551,8 @@ namespace OpenSim.Services.Connectors.Simulation
537 551
538 public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) 552 public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall)
539 { 553 {
554 IPEndPoint ext = destination.ExternalEndPoint;
555 if (ext == null) return false;
540 string uri 556 string uri
541 = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + ObjectPath() + sog.UUID + "/"; 557 = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + ObjectPath() + sog.UUID + "/";
542 //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); 558 //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri);
diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs
new file mode 100644
index 0000000..bdde369
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs
@@ -0,0 +1,17 @@
1////////////////////////////////////////////////////////////////
2//
3// (c) 2009, 2010 Careminster Limited and Melanie Thielker
4//
5// All rights reserved
6//
7using System;
8using Nini.Config;
9
10namespace OpenSim.Services.Interfaces
11{
12 public interface IAttachmentsService
13 {
14 string Get(string id);
15 void Store(string id, string data);
16 }
17}
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index ee06225..8cf846b 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -287,9 +287,13 @@ namespace OpenSim.Services.Interfaces
287 } 287 }
288 catch (SocketException e) 288 catch (SocketException e)
289 { 289 {
290 throw new Exception( 290 /*throw new Exception(
291 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + 291 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
292 e + "' attached to this exception", e); 292 e + "' attached to this exception", e);*/
293 // Don't throw a fatal exception here, instead, return Null and handle it in the caller.
294 // Reason is, on systems such as OSgrid it has occured that known hostnames stop
295 // resolving and thus make surrounding regions crash out with this exception.
296 return null;
293 } 297 }
294 298
295 return new IPEndPoint(ia, m_internalEndPoint.Port); 299 return new IPEndPoint(ia, m_internalEndPoint.Port);
@@ -347,6 +351,12 @@ namespace OpenSim.Services.Interfaces
347 if (kvp.ContainsKey("regionName")) 351 if (kvp.ContainsKey("regionName"))
348 RegionName = (string)kvp["regionName"]; 352 RegionName = (string)kvp["regionName"];
349 353
354 if (kvp.ContainsKey("access"))
355 {
356 byte access = Convert.ToByte((string)kvp["access"]);
357 Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
358 }
359
350 if (kvp.ContainsKey("serverIP")) 360 if (kvp.ContainsKey("serverIP"))
351 { 361 {
352 //int port = 0; 362 //int port = 0;
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 67d7cbe..33d6fde 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -71,6 +71,14 @@ namespace OpenSim.Services.Interfaces
71 bool ReleaseAgent(UUID originRegion, UUID id, string uri); 71 bool ReleaseAgent(UUID originRegion, UUID id, string uri);
72 72
73 /// <summary> 73 /// <summary>
74 /// Close child agent.
75 /// </summary>
76 /// <param name="regionHandle"></param>
77 /// <param name="id"></param>
78 /// <returns></returns>
79 bool CloseChildAgent(GridRegion destination, UUID id);
80
81 /// <summary>
74 /// Close agent. 82 /// Close agent.
75 /// </summary> 83 /// </summary>
76 /// <param name="regionHandle"></param> 84 /// <param name="regionHandle"></param>
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 0da1715..011cad8 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Services.LLLoginService
56 public static LLFailedLoginResponse InventoryProblem; 56 public static LLFailedLoginResponse InventoryProblem;
57 public static LLFailedLoginResponse DeadRegionProblem; 57 public static LLFailedLoginResponse DeadRegionProblem;
58 public static LLFailedLoginResponse LoginBlockedProblem; 58 public static LLFailedLoginResponse LoginBlockedProblem;
59 public static LLFailedLoginResponse UnverifiedAccountProblem;
59 public static LLFailedLoginResponse AlreadyLoggedInProblem; 60 public static LLFailedLoginResponse AlreadyLoggedInProblem;
60 public static LLFailedLoginResponse InternalError; 61 public static LLFailedLoginResponse InternalError;
61 62
@@ -76,6 +77,10 @@ namespace OpenSim.Services.LLLoginService
76 LoginBlockedProblem = new LLFailedLoginResponse("presence", 77 LoginBlockedProblem = new LLFailedLoginResponse("presence",
77 "Logins are currently restricted. Please try again later.", 78 "Logins are currently restricted. Please try again later.",
78 "false"); 79 "false");
80 UnverifiedAccountProblem = new LLFailedLoginResponse("presence",
81 "Your account has not yet been verified. Please check " +
82 "your email and click the provided link.",
83 "false");
79 AlreadyLoggedInProblem = new LLFailedLoginResponse("presence", 84 AlreadyLoggedInProblem = new LLFailedLoginResponse("presence",
80 "You appear to be already logged in. " + 85 "You appear to be already logged in. " +
81 "If this is not the case please wait for your session to timeout. " + 86 "If this is not the case please wait for your session to timeout. " +
@@ -325,6 +330,7 @@ namespace OpenSim.Services.LLLoginService
325 private void FillOutRegionData(GridRegion destination) 330 private void FillOutRegionData(GridRegion destination)
326 { 331 {
327 IPEndPoint endPoint = destination.ExternalEndPoint; 332 IPEndPoint endPoint = destination.ExternalEndPoint;
333 if (endPoint == null) return;
328 SimAddress = endPoint.Address.ToString(); 334 SimAddress = endPoint.Address.ToString();
329 SimPort = (uint)endPoint.Port; 335 SimPort = (uint)endPoint.Port;
330 RegionX = (uint)destination.RegionLocX; 336 RegionX = (uint)destination.RegionLocX;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index fcfdd1d..35adf0f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -229,6 +229,12 @@ namespace OpenSim.Services.LLLoginService
229 return LLFailedLoginResponse.UserProblem; 229 return LLFailedLoginResponse.UserProblem;
230 } 230 }
231 231
232 if (account.UserLevel < 0)
233 {
234 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: Unverified account");
235 return LLFailedLoginResponse.UnverifiedAccountProblem;
236 }
237
232 if (account.UserLevel < m_MinLoginLevel) 238 if (account.UserLevel < m_MinLoginLevel)
233 { 239 {
234 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel); 240 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel);
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
index 4a15cf2..5bab62c 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common.Mock
54 return assets.Find(x=>x.FullID == uuid); 54 return assets.Find(x=>x.FullID == uuid);
55 } 55 }
56 56
57 public void StoreAsset(AssetBase asset) 57 public bool StoreAsset(AssetBase asset)
58 { 58 {
59 assets.Add(asset); 59 assets.Add(asset);
60 return true;
60 } 61 }
61 62
62 public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); } 63 public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index b2c8b35..fbc339a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Mock
65 public event MoneyTransferRequest OnMoneyTransferRequest; 65 public event MoneyTransferRequest OnMoneyTransferRequest;
66 public event ParcelBuy OnParcelBuy; 66 public event ParcelBuy OnParcelBuy;
67 public event Action<IClientAPI> OnConnectionClosed; 67 public event Action<IClientAPI> OnConnectionClosed;
68 68 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
69 public event ImprovedInstantMessage OnInstantMessage; 69 public event ImprovedInstantMessage OnInstantMessage;
70 public event ChatMessage OnChatFromClient; 70 public event ChatMessage OnChatFromClient;
71 public event TextureRequest OnRequestTexture; 71 public event TextureRequest OnRequestTexture;
@@ -487,7 +487,7 @@ namespace OpenSim.Tests.Common.Mock
487 487
488 } 488 }
489 489
490 public virtual void SendKillObject(ulong regionHandle, uint localID) 490 public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
491 { 491 {
492 } 492 }
493 493
@@ -885,6 +885,10 @@ namespace OpenSim.Tests.Common.Mock
885 885
886 public void Close() 886 public void Close()
887 { 887 {
888 Close(true);
889 }
890 public void Close(bool sendStop)
891 {
888 m_scene.RemoveClient(AgentId); 892 m_scene.RemoveClient(AgentId);
889 } 893 }
890 894
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
index bd52f62..8c9d38b 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
@@ -535,17 +535,10 @@ namespace Amib.Threading
535 // Process until shutdown. 535 // Process until shutdown.
536 while(!_shutdown) 536 while(!_shutdown)
537 { 537 {
538 // Update the last time this thread was seen alive. 538
539 // It's good for debugging.
540 _workerThreads[Thread.CurrentThread] = DateTime.Now;
541
542 // Wait for a work item, shutdown, or timeout 539 // Wait for a work item, shutdown, or timeout
543 WorkItem workItem = Dequeue(); 540 WorkItem workItem = Dequeue();
544 541
545 // Update the last time this thread was seen alive.
546 // It's good for debugging.
547 _workerThreads[Thread.CurrentThread] = DateTime.Now;
548
549 // On timeout or shut down. 542 // On timeout or shut down.
550 if (null == workItem) 543 if (null == workItem)
551 { 544 {
@@ -554,6 +547,10 @@ namespace Amib.Threading
554 { 547 {
555 lock(_workerThreads.SyncRoot) 548 lock(_workerThreads.SyncRoot)
556 { 549 {
550 // Update the last time this thread was seen alive.
551 // It's good for debugging.
552 _workerThreads[Thread.CurrentThread] = DateTime.Now;
553
557 if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads) 554 if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
558 { 555 {
559 // Inform that the thread is quiting and then quit. 556 // Inform that the thread is quiting and then quit.
diff --git a/bin/OpenSim.Framework.Communications.Tests.dll.config b/bin/OpenSim.Framework.Communications.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Framework.Communications.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Framework.Servers.Tests.dll.config b/bin/OpenSim.Framework.Servers.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Framework.Servers.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Framework.Tests.dll.config b/bin/OpenSim.Framework.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Framework.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.CoreModules.Tests.dll.config b/bin/OpenSim.Region.CoreModules.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.CoreModules.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.Framework.Tests.dll.config b/bin/OpenSim.Region.Framework.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.Framework.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.ScriptEngine.Tests.dll.config b/bin/OpenSim.Region.ScriptEngine.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.ScriptEngine.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSimDefaults.ini.example b/bin/OpenSimDefaults.ini.example
new file mode 100644
index 0000000..ef8f73a
--- /dev/null
+++ b/bin/OpenSimDefaults.ini.example
@@ -0,0 +1,1325 @@
1[Startup]
2 ; Set this to true if you want to log crashes to disk
3 ; this can be useful when submitting bug reports.
4 save_crashes = false
5
6 ; Directory to save crashes to if above is enabled
7 ; (default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
8 crash_dir = "crashes"
9
10 ; Place to create a PID file
11 ; PIDFile = "/tmp/my.pid"
12
13 ; Http proxy support for llHTTPRequest and dynamic texture loading
14 ; Set HttpProxy to the URL for your proxy server if you would like
15 ; to proxy llHTTPRequests through a firewall
16 ; HttpProxy = "http://proxy.com"
17 ; Set HttpProxyExceptions to a list of regular expressions for
18 ; URLs that you don't want going through the proxy such as servers
19 ; inside your firewall, separate patterns with a ';'
20 ; HttpProxyExceptions = ".mydomain.com;localhost"
21
22 startup_console_commands_file = "startup_commands.txt"
23 shutdown_console_commands_file = "shutdown_commands.txt"
24
25 ; To run a script every few minutes, set the script filename here
26 ; timer_Script = "filename"
27
28 ; ##
29 ; ## SYSTEM
30 ; ##
31
32 ; Sets the method that OpenSim will use to fire asynchronous
33 ; events. Valid values are UnsafeQueueUserWorkItem,
34 ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
35 ; SmartThreadPool is reported to work well on Mono/Linux, but
36 ; UnsafeQueueUserWorkItem has been benchmarked with better
37 ; performance on .NET/Windows
38 async_call_method = SmartThreadPool
39
40 ; Max threads to allocate on the FireAndForget thread pool
41 ; when running with the SmartThreadPool option above
42 MaxPoolThreads = 15
43
44 ; ##
45 ; ## CLIENTS
46 ; ##
47
48 ; Enables EventQueueGet Service.
49 EventQueue = true
50
51 ; Set this to the DLL containing the client stack to use.
52 clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
53
54 ; ##
55 ; ## REGIONS
56 ; ##
57
58 ; Determine where OpenSimulator looks for the files which tell it which regions to server
59 ; Defaults to "filesystem" if this setting isn't present
60 region_info_source = "filesystem"
61 ; region_info_source = "web"
62
63 ; Determines where the region XML files are stored if you are loading these from the filesystem.
64 ; Defaults to bin/Regions in your OpenSimulator installation directory
65 ; regionload_regionsdir="C:\somewhere\xmlfiles\"
66
67 ; Determines the page from which regions xml is retrieved if you are loading these from the web
68 ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
69 ; except that everything is also enclosed in a <Regions> tag.
70 ; regionload_webserver_url = "http://example.com/regions.xml";
71
72 ; Draw objects on maptile. This step might take a long time if you've got a large number of
73 ; objects, so you can turn it off here if you'd like.
74 DrawPrimOnMapTile = true
75 ; Use terrain texture for maptiles if true, use shaded green if false
76 TextureOnMapTile = false
77
78 ; Maximum total size, and maximum size where a prim can be physical
79 NonPhysicalPrimMax = 256
80 PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
81 ClampPrimSize = false
82
83 ; Allow scripts to cross region boundaries. These are recompiled on the new region.
84 AllowScriptCrossing = false
85
86 ; Allow compiled script binary code to cross region boundaries.
87 ; If you set this to "true", any region that can teleport to you can
88 ; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
89 ; YOU HAVE BEEN WARNED!!!
90 TrustBinaries = false
91
92 ; Combine all contiguous regions into one large megaregion
93 ; Order your regions from South to North, West to East in your regions.ini and then set this to true
94 ; Warning! Don't use this with regions that have existing content!, This will likely break them
95 CombineContiguousRegions = false
96
97 ; If you have only one region in an instance, or to avoid the many bugs
98 ; that you can trigger in modules by restarting a region, set this to
99 ; true to make the entire instance exit instead of restarting the region.
100 ; This is meant to be used on systems where some external system like
101 ; Monit will restart any instance that exits, thereby making the shutdown
102 ; into a restart.
103 ;InworldRestartShutsDown = false
104
105 ; ##
106 ; ## PRIM STORAGE
107 ; ##
108
109 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
110 ; prevent frequently changing objects from heavily loading the region data store.
111 ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
112 ;
113 ; Objects will be considered for persistance in the next sweep when they have not changed for this number of seconds
114 MinimumTimeBeforePersistenceConsidered = 60
115 ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
116 MaximumTimeBeforePersistenceConsidered = 600
117
118 ; Should avatars in neighbor sims see objects in this sim?
119 see_into_this_sim_from_neighbor = true
120
121 ; ##
122 ; ## PHYSICS
123 ; ##
124
125 ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
126 physical_prim = true
127
128 ; Select a mesher here.
129 ;
130 ; Meshmerizer properly handles complex prims by using triangle meshes.
131 ; Note that only the ODE physics engine currently deals with meshed prims in a satisfactory way
132 ;
133 ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
134 ; Usually this is only a box
135
136 meshing = Meshmerizer
137 ;meshing = ZeroMesher
138
139 ; Choose one of the physics engines below
140 ; OpenDynamicsEngine is by some distance the most developed physics engine
141 ; basicphysics effectively does not model physics at all, making all objects phantom
142
143 physics = OpenDynamicsEngine
144 ;physics = basicphysics
145 ;physics = POS
146 ;physics = modified_BulletX
147
148 ; ##
149 ; ## PERMISSIONS
150 ; ##
151
152 ;permissionmodules = "DefaultPermissionsModule"
153
154 ;If any of the specified permissions modules fail to load, quit?
155 SecurePermissionsLoading = true
156
157 ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
158 ; any item, etc. This may not yet be implemented uniformally.
159 ; If set to true, then all permissions checks are carried out
160 ; Default is false
161 serverside_object_permissions = false
162
163 allow_grid_gods = false
164
165 ; This allows somne control over permissions
166 ; please note that this still doesn't duplicate SL, and is not intended to
167 ;region_owner_is_god = true
168 ;region_manager_is_god = false
169 ;parcel_owner_is_god = true
170
171 ; Control user types that are allowed to create new scripts
172 ; Only enforced if serviceside_object_permissions is true
173 ;
174 ; Current possible values are
175 ; all - anyone can create scripts (subject to normal permissions)
176 ; gods - only administrators can create scripts (as long as allow_grid_gods is true)
177 ; Default value is all
178 ; allowed_script_creators = all
179
180 ; Control user types that are allowed to edit (save) scripts
181 ; Only enforced if serviceside_object_permissions is true
182 ;
183 ; Current possible values are
184 ; all - anyone can edit scripts (subject to normal permissions)
185 ; gods - only administrators can edit scripts (as long as allow_grid_gods is true)
186 ; Default value is all
187 ; allowed_script_editors = all
188
189 ; ##
190 ; ## SCRIPT ENGINE
191 ; ##
192
193 DefaultScriptEngine = "XEngine"
194
195 ; ##
196 ; ## WORLD MAP
197 ; ##
198
199 ;WorldMapModule = "WorldMap"
200 ;MapImageModule = "MapImageModule"
201 ; Set to false to not generate any maptiles
202 ;GenerateMaptiles = "true"
203 ; Refresh (in seconds) the map tile periodically
204 ;MaptileRefresh = 0
205 ; If not generating maptiles, use this static texture asset ID
206 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
207
208 ; ##
209 ; ## EMAIL MODULE
210 ; ##
211
212 ;emailmodule = DefaultEmailModule
213
214 ; ##
215 ; ## ANIMATIONS
216 ; ##
217
218 ; If enabled, enableFlySlow will change the primary fly state to
219 ; FLYSLOW, and the "always run" state will be the regular fly.
220
221 enableflyslow = false
222
223 ; PreJump is an additional animation state, but it probably
224 ; won't look right until the physics engine supports it
225 ; (i.e delays takeoff for a moment)
226
227 ; This is commented so it will come on automatically once it's
228 ; supported.
229
230 ; enableprejump = true
231
232 ; Simulator Stats URI
233 ; Enable JSON simulator data by setting a URI name (case sensitive)
234 ; Stats_URI = "jsonSimStats"
235
236 ; Make OpenSim start all regions woth logins disabled. They will need
237 ; to be enabled from the console if this is set
238 ; StartDisabled = false
239
240 ; Image decoding. Use CSJ2K for layer boundary decoding if true,
241 ; OpenJPEG if false
242 ; UseCSJ2K = true
243
244[SMTP]
245 enabled=false
246
247 ;enabled=true
248 ;internal_object_host=lsl.opensim.local
249 ;host_domain_header_from=127.0.0.1
250 ;SMTP_SERVER_HOSTNAME=127.0.0.1
251 ;SMTP_SERVER_PORT=25
252 ;SMTP_SERVER_LOGIN=foo
253 ;SMTP_SERVER_PASSWORD=bar
254
255[Network]
256 ConsoleUser = "Test"
257 ConsolePass = "secret"
258 http_listener_port = 9000
259 console_port = 0
260
261 ; ssl config: Experimental! The auto https config only really works definately on windows XP now
262 ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
263 ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now
264 http_listener_ssl = false ; Also create a SSL server
265 http_listener_cn = "localhost" ; Use the cert with the common name
266 http_listener_sslport = 9001 ; Use this port for SSL connections
267 http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
268
269 ; Hostname to use in llRequestURL/llRequestSecureURL
270 ; if not defined - default machine name is being used
271 ; (on Windows this mean NETBIOS name - useably only inside local network)
272 ; ExternalHostNameForLSL=127.0.0.1
273
274 ; What is reported as the "X-Secondlife-Shard"
275 ; Defaults to the user server url if not set
276 ; The old default is "OpenSim", set here for compatibility
277 shard = "OpenSim"
278
279 ; What is reported as the "User-Agent" when using llHTTPRequest
280 ; Defaults to not sent if not set here. See the notes section in the wiki at
281 ; http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
282 ; " (Mozilla Compatible)" to the text where there are problems with a web server
283 ;user_agent = "OpenSim LSL (Mozilla Compatible)"
284
285[XMLRPC]
286 ; ##
287 ; ## Scripting XMLRPC mapper
288 ; ##
289
290 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
291 ; script concurrently with the first remote_data event.
292 ; This will contain the fully qualified URI an external site needs
293 ; to use to send XMLRPC requests to that script
294
295 ;XmlRpcRouterModule = "XmlRpcRouterModule"
296 ;XmlRpcPort = 20800
297
298[ClientStack.LindenUDP]
299 ; Set this to true to process incoming packets asynchronously. Networking is
300 ; already separated from packet handling with a queue, so this will only
301 ; affect whether networking internals such as packet decoding and
302 ; acknowledgement accounting are done synchronously or asynchronously
303 ;
304 ;async_packet_handling = false
305
306 ; The client socket receive buffer size determines how many
307 ; incoming requests we can process; the default on .NET is 8192
308 ; which is about 2 4k-sized UDP datagrams. On mono this is
309 ; whatever the underlying operating system has as default; for
310 ; example, ubuntu 8.04 or SLES11 have about 111k, which is about
311 ; 27 4k-sized UDP datagrams (on linux platforms you can [as root]
312 ; do "sysctl net.core.rmem_default" to find out what your system
313 ; uses a default socket receive buffer size.
314 ;
315 ; client_socket_rcvbuf_size allows you to specify the receive
316 ; buffer size LLUDPServer should use. NOTE: this will be limited
317 ; by the system's settings for the maximum client receive buffer
318 ; size (on linux systems you can set that with "sysctl -w
319 ; net.core.rmem_max=X")
320 ;
321 ;client_socket_rcvbuf_size = 8388608
322
323 ; Maximum outbound bytes per second for a single scene. This can be used to
324 ; throttle total outbound UDP traffic for a simulator. The default value is
325 ; 0, meaning no throttling at the scene level. The example given here is
326 ; 20 megabits
327 ;
328 ;scene_throttle_max_bps = 2621440
329
330 ; Maximum bits per second to send to any single client. This will override
331 ; the user's viewer preference settings. The default value is 0, meaning no
332 ; aggregate throttling on clients (only per-category throttling). The
333 ; example given here is 1.5 megabits
334 ;
335 ;client_throttle_max_bps = 196608
336
337 ; Per-client bytes per second rates for the various throttle categories.
338 ; These are default values that will be overriden by clients
339 ;
340 ;resend_default = 12500
341 ;land_default = 1000
342 ;wind_default = 1000
343 ;cloud_default = 1000
344 ;task_default = 1000
345 ;texture_default = 1000
346 ;asset_default = 1000
347 ;state_default = 1000
348
349 ; Per-client maximum burst rates in bytes per second for the various
350 ; throttle categories. These are default values that will be overriden by
351 ; clients
352 ;
353 ;resend_limit = 18750
354 ;land_limit = 29750
355 ;wind_limit = 18750
356 ;cloud_limit = 18750
357 ;task_limit = 18750
358 ;texture_limit = 55750
359 ;asset_limit = 27500
360 ;state_limit = 37000
361
362 ; Configures how ObjectUpdates are aggregated. These numbers
363 ; do not literally mean how many updates will be put in each
364 ; packet that goes over the wire, as packets are
365 ; automatically split on a 1400 byte boundary. These control
366 ; the balance between responsiveness of interest list updates
367 ; and total throughput. Higher numbers will ensure more full-
368 ; sized packets and faster sending of data, but more delay in
369 ; updating interest lists
370 ;
371 ;PrimTerseUpdatesPerPacket = 25
372 ;AvatarTerseUpdatesPerPacket = 10
373 ;PrimFullUpdatesPerPacket = 100
374
375 ; TextureSendLimit determines how many packets will be put on
376 ; the outgoing queue each cycle. Like the settings above, this
377 ; is a balance between responsiveness to priority updates and
378 ; total throughput. Higher numbers will give a better
379 ; throughput at the cost of reduced responsiveness to client
380 ; priority changes or transfer aborts
381 ;
382 ;TextureSendLimit = 20
383
384 ; Quash and remove any light properties from attachments not on the
385 ; hands. This allows flashlights and lanterns to function, but kills
386 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
387 ; will also be affected.
388 ;
389 ;DisableFacelights = "false"
390
391[Chat]
392 ; Controls whether the chat module is enabled. Default is true.
393 enabled = true;
394
395 ; Distance in meters that whispers should travel. Default is 10m
396 whisper_distance = 10
397
398 ; Distance in meters that ordinary chat should travel. Default is 30m
399 say_distance = 30
400
401 ; Distance in meters that shouts should travel. Default is 100m
402 shout_distance = 100
403
404 ; Append a prefix to the god avatar names appearing in chat whilst in god mode
405 ; admin_prefix = "@"
406
407
408[Messaging]
409 ; Control which region module is used for instant messaging.
410 ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
411 InstantMessageModule = InstantMessageModule
412 ; MessageTransferModule = MessageTransferModule
413 ; OfflineMessageModule = OfflineMessageModule
414 ; OfflineMessageURL = http://yourserver/Offline.php
415 ; MuteListModule = MuteListModule
416 ; MuteListURL = http://yourserver/Mute.php
417
418 ; Control whether group messages are forwarded to offline users. Default is true.
419 ; ForwardOfflineGroupMessages = true
420
421
422[ODEPhysicsSettings]
423 ;##
424 ;## World Settings
425 ;##
426
427 ;Gravity. Feel like falling up? change world_gravityz to 9.8 instead of -9.8. m/s
428 world_gravityx = 0
429 world_gravityy = 0
430 world_gravityz = -9.8
431
432 ; World Step size. (warning these are dangerous. Changing these will probably cause your scene to explode dramatically)
433 ; reference: fps = (0.09375/ODE_STEPSIZE) * 1000;
434 world_stepsize = 0.020
435 world_internal_steps_without_collisions = 10
436
437 ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
438 world_hashspace_size_low = -4
439 world_hashSpace_size_high = 128
440
441 ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim
442 meters_in_small_space = 29.9
443 small_hashspace_size_low = -4
444 small_hashspace_size_high = 66
445
446 ; ##
447 ; ## Contact properties. (the stuff that happens when things come in contact with each other)
448 ; ##
449
450 ; surface layer around geometries other geometries can sink into before generating a contact
451 world_contact_surface_layer = 0.001
452
453 ; Filtering collisions helps keep things stable physics wise, but sometimes
454 ; it can be overzealous. If you notice bouncing, chances are it's that.
455 filter_collisions = false
456
457 ; Non Moving Terrain Contact (avatar isn't moving)
458 nm_terraincontact_friction = 255.0
459 nm_terraincontact_bounce = 0.1
460 nm_terraincontact_erp = 0.1025
461
462 ; Moving Terrain Contact (avatar is moving)
463 m_terraincontact_friction = 75.0
464 m_terraincontact_bounce = 0.05
465 m_terrainContact_erp = 0.05025
466
467 ; Moving Avatar to object Contact
468 m_avatarobjectcontact_friction = 75.0
469 m_avatarobjectcontact_bounce = 0.1
470
471 ; Object to Object Contact and Non-Moving Avatar to object
472 objectcontact_friction = 250.0
473 objectcontact_bounce = 0.2
474
475 ; ##
476 ; ## Avatar Control
477 ; ##
478
479 ; PID Controller Settings. These affect the math that causes the avatar to reach the
480 ; desired velocity
481 ; See http://en.wikipedia.org/wiki/PID_controller
482
483 av_pid_derivative_linux = 2200.0
484 av_pid_proportional_linux = 900.0;
485
486 av_pid_derivative_win = 2200.0
487 av_pid_proportional_win = 900.0;
488
489 ;girth of the avatar. Adds radius to the height also
490 av_capsule_radius = 0.37
491
492 ; Max force permissible to use to keep the avatar standing up straight
493 av_capsule_standup_tensor_win = 550000
494 av_capsule_standup_tensor_linux = 550000
495
496 ; specifies if the capsule should be tilted (=true; old compatibility mode)
497 ; or straight up-and-down (=false; better and more consistent physics behavior)
498 av_capsule_tilted = false
499
500 ; used to calculate mass of avatar.
501 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
502 ; av_density * AVvolume;
503 av_density = 80
504
505 ; use this value to cut 52% of the height the sim gives us
506 av_height_fudge_factor = 0.52
507
508 ; Movement. Smaller is faster.
509
510 ; speed of movement with Always Run off
511 av_movement_divisor_walk = 1.3
512
513 ; speed of movement with Always Run on
514 av_movement_divisor_run = 0.8
515
516 ; When the avatar flies, it will be moved up by this amount off the ground (in meters)
517 minimum_ground_flight_offset = 3.0
518
519 ; ##
520 ; ## Object options
521 ; ##
522
523 ; used in the mass calculation.
524 geometry_default_density = 10.000006836
525
526 ; amount of ODE steps where object is non moving for ODE to automatically put it to sleep
527 body_frames_auto_disable = 20
528
529 ; used to control llMove2Target
530 body_pid_derivative = 35
531 body_pid_gain = 25
532
533 ; maximum number of contact points to generate per collision
534 contacts_per_collision = 80
535
536 ; amount of time a geom/body will try to cross a region border before it gets disabled
537 geom_crossing_failures_before_outofbounds = 5
538
539 ; start throttling the object updates if object comes in contact with 3 or more other objects
540 geom_contactpoints_start_throttling = 3
541
542 ; send 1 update for every x updates below when throttled
543 geom_updates_before_throttled_update = 15
544
545 ; Used for llSetStatus. How rigid the object rotation is held on the axis specified
546 body_motor_joint_maxforce_tensor_linux = 5
547 body_motor_joint_maxforce_tensor_win = 5
548
549 ; Maximum mass an object can be before it is clamped
550 maximum_mass_object = 10000.01
551
552 ; ##
553 ; ## Sculpted Prim settings
554 ; ##
555
556 ; Do we want to mesh sculpted prim to collide like they look?
557 mesh_sculpted_prim = true
558
559 ; number^2 non-physical level of detail of the sculpt texture. 32x32 - 1024 verticies
560 mesh_lod = 32
561
562 ; number^2 physical level of detail of the sculpt texture. 16x16 - 256 verticies
563 mesh_physical_lod = 16
564
565 ; ##
566 ; ## Physics logging settings - logfiles are saved to *.DIF files
567 ; ##
568
569 ; default is false
570 ;physics_logging = true
571 ;; every n simulation iterations, the physics snapshot file is updated
572 ;physics_logging_interval = 50
573 ;; append to existing physics logfile, or overwrite existing logfiles?
574 ;physics_logging_append_existing_logfile = true
575
576 ; ##
577 ; ## Joint support
578 ; ##
579
580 ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
581 ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
582 ; default is false
583 ;use_NINJA_physics_joints = true
584
585 ; ##
586 ; ## additional meshing options
587 ; ##
588
589 ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
590 ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
591 ; true. Note that this will increase memory usage and region startup time. Default is false.
592 ;force_simple_prim_meshing = true
593
594
595[RemoteAdmin]
596 enabled = false
597
598 ; Set this to a nonzero value to have remote admin use a different port
599 port = 0
600
601 ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
602 access_password = unknown
603
604 ; set this variable to true if you want the create_region XmlRpc
605 ; call to unconditionally enable voice on all parcels for a newly
606 ; created region [default: false]
607 create_region_enable_voice = false
608
609 ; set this variable to false if you want the create_region XmlRpc
610 ; call to create all regions as private per default (can be
611 ; overridden in the XmlRpc call) [default: true]
612 create_region_public = false
613
614 ; the create_region XmlRpc call uses region_file_template to generate
615 ; the file name of newly create regions (if they are created
616 ; persistent). the parameter available are:
617 ; {0} - X location
618 ; {1} - Y location
619 ; {2} - region UUID
620 ; {3} - region port
621 ; {4} - region name with " ", ":", "/" mapped to "_"
622 region_file_template = "{0}x{1}-{2}.ini"
623
624 ; we can limit the number of regions that XmlRpcCreateRegion will
625 ; allow by setting this to a positive, non-0 number: as long as the
626 ; number of regions is below region_limits, XmlRpcCreateRegion will
627 ; succeed. setting region_limit to 0 disables the check.
628 ; default is 0
629 ;region_limit = 0
630
631 ; enable only those methods you deem to be appropriate using a | delimited whitelist
632 ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
633 ; if this parameter is not specified but enabled = true, all methods will be available
634 enabled_methods = all
635
636 ; specify the default appearance for an avatar created through the remote admin interface
637 ; This will only take effect is the file specified by the default_appearance setting below exists
638 ;default_male = Default Male
639 ;default_female = Default Female
640
641 ; update appearance copies inventory items and wearables of default avatars. if this value is false
642 ; (default), just worn assets are copied to the Clothes folder; if true, all Clothes and Bodyparts
643 ; subfolders are copied. the receiver will wear the same items the default avatar did wear.
644 ;copy_folders = false
645
646 ; path to default appearance XML file that specifies the look of the default avatars
647 ;default_appearance = default_appearance.xml
648
649[RestPlugins]
650 ; Change this to true to enable REST Plugins. This must be true if you wish to use
651 ; REST Region or REST Asset and Inventory Plugins
652 enabled = false
653 god_key = SECRET
654 prefix = /admin
655
656
657[RestRegionPlugin]
658 ; Change this to true to enable the REST Region Plugin
659 enabled = false
660
661
662[RestHandler]
663 ; Change this to true to enable the REST Asset and Inventory Plugin
664 enabled = false
665 authenticate = true
666 secured = true
667 extended-escape = true
668 realm = OpenSim REST
669 dump-asset = false
670 path-fill = true
671 dump-line-size = 32
672 flush-on-error = true
673
674
675; Uncomment the following for IRC bridge
676; experimental, so if it breaks... keep both parts... yada yada
677; also, not good error detection when it fails
678;[IRC]
679 ;enabled = true ; you need to set this otherwise it won't connect
680 ;server = name.of.irc.server.on.the.net
681 ;; user password - only use this if the server requires one
682 ;password = mypass
683 ;nick = OpenSimBotNameProbablyMakeThisShorter
684 ;channel = #the_irc_channel_you_want_to_connect_to
685 ;user = "USER OpenSimBot 8 * :I'm an OpenSim to IRC bot"
686 ;port = 6667
687 ;; channel to listen for configuration commands
688 ;commands_enabled = false
689 ;command_channel = 2777
690 ;report_clients = true
691 ;; relay private chat connections
692 ;; relay_private_channels = true: will relay IRC chat from/to private in-world channels
693 ;; relay_private_channel_out -- channel to send messages out to the IRC bridge
694 ;; relay_private_channel_in -- channel to receive message from the IRC bridge
695 ;; relay_chat = false: IRC bridge will not relay normal chat
696 ;; access_password -- simple security device
697 ;;
698 ;; so, to just relay chat from an IRC channel to in-world region and vice versa:
699 ;;
700 ;; relay_private_channels = false
701 ;; relay_chat = true
702 ;;
703 ;; to relay chat only to/from private in-world channels:
704 ;;
705 ;; relay_chat = false
706 ;; relay_private_channels = true
707 ;; relay_private_channel_in = 2226
708 ;; relay_private_channel_out = 2225
709 ;;
710 ;; in this example, all chat coming in from IRC will be send out via
711 ;; in-world channel 2226, and all chat from in-world channel 2225 will
712 ;; be relayed to the IRC channel.
713 ;;
714 ;relay_private_channels = false
715 ;relay_private_channel_in = 2226
716 ;relay_private_channel_out = 2225
717 ;relay_chat = true
718 ;access_password = foobar
719
720 ;;fallback_region = name of "default" region
721 ;;MSGformat fields : 0=botnick, 1=user, 2=region, 3=message
722 ;; must start with "PRIVMSG {0} : " or irc server will get upset
723 ;;for <bot>:<user in region> :<message>
724 ;;msgformat = "PRIVMSG {0} :<{1} in {2}>: {3}"
725 ;;for <bot>:<message> - <user of region> :
726 ;msgformat = "PRIVMSG {0} : {3} - {1} of {2}"
727 ;;for <bot>:<message> - from <user> :
728 ;;msgformat = "PRIVMSG {0} : {3} - from {1}"
729
730 ;; exclude_list allows you to stop the IRC connector from announcing the
731 ;;arrival and departure of certain users. For example: admins, bots.
732
733 ;exclude_list=User 1,User 2,User 3
734
735
736;[CMS]
737 ;enabled = true
738 ;channel = 345
739
740
741; Uncomment the following to control the progression of daytime
742; in the Sim. The defaults are what is shown below
743;[Sun]
744 ; number of wall clock hours for an opensim day. 24.0 would mean realtime
745 ;day_length = 4
746 ; Year length in days
747 ;year_length = 60
748 ; Day to Night Ratio
749 ;day_night_offset = 0.45
750 ; send a Sun update every update_interval # of frames. A lower number will
751 ; make for smoother sun transition at the cost of network
752 ;update_interval = 100
753
754
755[Wind]
756 ; Enables the wind module. Default is true
757 enabled = true
758
759 ; How often should wind be updated, as a function of world frames. Approximately 50 frames a second
760 wind_update_rate = 150
761
762 ; The Default Wind Plugin to load
763 wind_plugin = SimpleRandomWind
764
765 ; These settings are specific to the ConfigurableWind plugin
766 ; To use ConfigurableWind as the default, simply change wind_plugin to ConfigurableWind and uncomment the following.
767 ; avg_strength = 5.0
768 ; avg_direction = 0.0
769 ; var_strength = 0.0
770 ; var_direction = 0.0
771 ; rate_change = 1.0
772
773 ; This setting is specific to the SimpleRandomWind plugin
774 ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind. Default is 1.0
775 strength = 1.0
776
777
778[Cloud]
779 ; Enable this to generate classic particle clouds above the sim.
780 ; default is disabled - turn it on here
781 enabled = false
782
783 ; Density of cloud cover 0.0 to 1.0 Defult 0.5
784 density = 0.5
785
786 ; update interval for the cloud cover data returned by llCloud().
787 ; default is 1000
788 cloud_update_rate = 1000
789
790[LightShare]
791
792 ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
793 ; It has no ill effect on viewers which do not support server-side windlight settings.
794 ; Currently we only have support for MySQL databases.
795 enable_windlight = false;
796
797[Trees]
798 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
799 ; default is false
800 active_trees = false
801
802 ; Density of tree population
803 tree_density = 1000.0
804
805
806[VectorRender]
807
808 ; the font to use for rendering text (default: Arial)
809 ; font_name = "Arial"
810
811
812[LL-Functions]
813 ; Set the following to true to allow administrator owned scripts to execute console commands
814 ; currently unused
815 ; AllowosConsoleCommand=false
816
817 AllowGodFunctions = false
818
819 ; Maximum number of llListen events we allow per script
820 ; Set this to 0 to have no limit imposed.
821 max_listens_per_script = 64
822
823
824[DataSnapshot]
825 ; The following set of configs pertains to search.
826 ; Set index_sims to true to enable search engines to index your searchable data
827 ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
828 ; default is false
829 index_sims = false
830
831 ; The variable data_exposure controls what the regions expose:
832 ; minimum: exposes only things explicitly marked for search
833 ; all: exposes everything
834 data_exposure = minimum
835
836 ; If search is on, change this to your grid name; will be ignored for standalones
837 gridname = "OSGrid"
838
839 ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
840 ; Later, you may want to increase this to 3600 (1 hour) or more
841 default_snapshot_period = 1200
842
843 ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
844 snapshot_cache_directory = "DataSnapshot"
845
846 ; This semicolon-separated string serves to notify specific data services about the existence
847 ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
848 ;data_services="http://metaverseink.com/cgi-bin/register.py"
849
850
851[Economy]
852 ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only -
853
854 ; Enables selling things for $0
855 SellEnabled = "false"
856
857 ; 45000 is the highest value that the sim could possibly report because of protocol constraints
858 ObjectCapacity = 45000
859
860 ; Money Unit fee to upload textures, animations etc
861 PriceUpload = 0
862
863 ; Money Unit fee to create groups
864 PriceGroupCreate = 0
865
866 ; We don't really know what the rest of these values do. These get sent to the client
867 ; These taken from Agni at a Public Telehub. Change at your own risk.
868 ObjectCount = 0
869 PriceEnergyUnit = 100
870 PriceObjectClaim = 10
871 PricePublicObjectDecay = 4
872 PricePublicObjectDelete = 4
873 PriceParcelClaim = 1
874 PriceParcelClaimFactor = 1
875
876 PriceRentLight = 5
877 TeleportMinPrice = 2
878 TeleportPriceExponent = 2
879 EnergyEfficiency = 1
880 PriceObjectRent = 1
881 PriceObjectScaleFactor = 10
882 PriceParcelRent = 1
883
884[Git]
885Enabled = true
886RepoPath = "git"
887
888;How many seconds between the scheduled commits?
889CommitInterval = 21600
890
891;Disable all except the initial commit?
892DisableNonEssentialCommits = false
893
894;Should we automatically commit when necessary to avoid objects never making it into the repo?
895UseSafetyCommit = true
896
897
898[SVN]
899 Enabled = false
900 Directory = SVNmodule\repo
901 URL = "svn://your.repo.here/"
902 Username = "user"
903 Password = "password"
904 ImportOnStartup = false
905 Autosave = false
906 AutoSavePeriod = 15 ; Number of minutes between autosave backups
907
908
909[XEngine]
910 ; Enable this engine in this OpenSim instance
911 Enabled = true
912
913 ; How many threads to keep alive even if nothing is happening
914 MinThreads = 2
915
916 ; How many threads to start at maximum load
917 MaxThreads = 100
918
919 ; Time a thread must be idle (in seconds) before it dies
920 IdleTimeout = 60
921
922 ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
923 Priority = "BelowNormal"
924
925 ; Maximum number of events to queue for a script (excluding timers)
926 MaxScriptEventQueue = 300
927
928 ; Stack size per thread created
929 ThreadStackSize = 262144
930
931 ; Set this to true (the default) to load each script into a separate
932 ; AppDomain. Setting this to false will load all script assemblies into the
933 ; current AppDomain, which will reduce the per-script overhead at the
934 ; expense of reduced security and the inability to garbage collect the
935 ; script assemblies
936 AppDomainLoading = true
937
938 ; Rate to poll for asynchronous command replies (ms)
939 ; currently unused
940 ;AsyncLLCommandLoopms = 50
941
942 ; Save the source of all compiled scripts
943 WriteScriptSourceToDebugFile = false
944
945 ; Default language for scripts
946 DefaultCompileLanguage = lsl
947
948 ; List of allowed languages (lsl,vb,js,cs)
949 ; AllowedCompilers=lsl,cs,js,vb.
950 ; *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk.
951 AllowedCompilers=lsl
952
953 ; Compile debug info (line numbers) into the script assemblies
954 CompileWithDebugInformation = true
955
956 ; Allow the user of mod* functions. This allows a script to pass messages
957 ; to a region module via the modSendCommand() function
958 ; Default is false
959 AllowMODFunctions = false
960
961 ; Allow the use of os* functions (some are dangerous)
962 AllowOSFunctions = false
963
964 ; Allow the user of LightShare functions
965 AllowLightShareFunctions = false
966
967 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
968 OSFunctionThreatLevel = VeryLow
969
970 ; Interval (s) between background save of script states
971 SaveInterval = 120
972
973 ; Interval (s) between maintenance runs (0 = disable)
974 MaintenanceInterval = 10
975
976 ; Time a script can spend in an event handler before it is interrupted
977 EventLimit = 30
978
979 ; If a script overruns it's event limit, kill the script?
980 KillTimedOutScripts = false
981
982 ; Sets the multiplier for the scripting delays
983 ScriptDelayFactor = 1.0
984
985 ; The factor the 10 m distances llimits are multiplied by
986 ScriptDistanceLimitFactor = 1.0
987
988 ; Maximum length of notecard line read
989 ; Increasing this to large values potentially opens
990 ; up the system to malicious scripters
991 ; NotecardLineReadCharsMax = 255
992
993 ; Sensor settings
994 SensorMaxRange = 96.0
995 SensorMaxResults = 16
996
997 ; OS Functions enable/disable
998 ; For each function, you can add one line, as shown
999 ; The default for all functions allows them if below threat level
1000
1001 ; true allows the use of the function unconditionally
1002 ; Allow_osSetRegionWaterHeight = true
1003
1004 ; false disables the function completely
1005 ; Allow_osSetRegionWaterHeight = false
1006
1007 ; Comma separated list of UUIDS allows the function for that list of UUIDS
1008 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
1009
1010 ; You can also use script creators as the uuid
1011 ; Creators_osSetRegionWaterHeight = <uuid>, ...
1012
1013 ; If both Allow_ and Creators_ are given, effective permissions
1014 ; are the union of the two.
1015
1016 ; Allow for llCreateLink and llBreakLink to work without asking for permission
1017 ; only enable this in a trusted environment otherwise you may be subject to hijacking
1018 ; AutomaticLinkPermission = false
1019
1020 ; Disable underground movement of prims (default true); set to
1021 ; false to allow script controlled underground positioning of
1022 ; prims
1023 ; DisableUndergroundMovement = true
1024
1025
1026[OpenGridProtocol]
1027 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
1028 ;On/true or Off/false
1029 ogp_enabled=false
1030
1031 ;Name Prefix/suffix when using OGP
1032 ogp_firstname_prefix=""
1033 ogp_lastname_suffix="_EXTERNAL"
1034
1035
1036[Concierge]
1037 ; Enable concierge module
1038 ; Default is false
1039 enabled = false
1040
1041 ; name of the concierge
1042 whoami = "jeeves"
1043
1044 ; password for updating the welcome message templates via XmlRpc
1045 password = SECRET
1046
1047 ; regex specifying for which regions concierge service is desired; if
1048 ; empty, then for all
1049 regions = "^MeetingSpace-"
1050
1051 ; for each region that matches the regions regexp you can provide
1052 ; (optionally) a welcome template using format substitution:
1053 ; {0} is replaced with the name of the avatar entering the region
1054 ; {1} is replaced with the name of the region
1055 ; {2} is replaced with the name of the concierge (whoami variable above)
1056
1057 welcomes = /path/to/welcome/template/directory
1058
1059 ; Concierge can send attendee lists to an event broker whenever an
1060 ; avatar enters or leaves a concierged region. the URL is subject
1061 ; to format substitution:
1062 ; {0} is replaced with the region's name
1063 ; {1} is replaced with the region's UUID
1064 broker = "http://broker.place.com/{1}"
1065
1066
1067[RegionReady]
1068 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
1069 ; default is false
1070 enabled = false
1071
1072 ; Channel on which to signal region readiness through a message
1073 ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
1074 ; - the first field indicating whether this is an initial server startup
1075 ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
1076 ; - the third field is a number indicating how many scripts failed to compile
1077 ; - "oar error" if supplied, provides the error message from the OAR load
1078 channel_notify = -800
1079
1080
1081[MRM]
1082 ; Enables the Mini Region Modules Script Engine.
1083 ; default is false
1084 Enabled = false
1085
1086 ; Runs MRM in a Security Sandbox
1087 ; WARNING: DISABLING IS A SECURITY RISK.
1088 Sandboxed = true
1089
1090 ; The level sandbox to use, adjust at your OWN RISK.
1091 ; Valid values are:
1092 ; * FullTrust
1093 ; * SkipVerification
1094 ; * Execution
1095 ; * Nothing
1096 ; * LocalIntranet
1097 ; * Internet
1098 ; * Everything
1099 SandboxLevel = "Internet"
1100
1101 ; Only allow Region Owners to run MRMs
1102 ; May represent a security risk if you disable this.
1103 OwnerOnly = true
1104
1105[Hypergrid]
1106 ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
1107 safemode = false
1108
1109[VivoxVoice]
1110 ; The VivoxVoice module will allow you to provide voice on your
1111 ; region(s). It uses the same voice technology as the LL grid and
1112 ; works with recent LL clients (we have tested 1.22.9.110075, so
1113 ; anything later ought to be fine as well).
1114 ;
1115 ; For this to work you need to obtain an admin account from Vivox
1116 ; that allows you to create voice accounts and region channels.
1117
1118 enabled = false
1119
1120 ; vivox voice server
1121 vivox_server = www.foobar.vivox.com
1122
1123 ; vivox SIP URI
1124 vivox_sip_uri = foobar.vivox.com
1125
1126 ; vivox admin user name
1127 vivox_admin_user = DeepThroat
1128
1129 ; vivox admin password
1130 vivox_admin_password = VoiceG4te
1131
1132 ; channel type: "channel" or "positional"
1133 ; - positional: spatial sound (default)
1134 ; - channel: normal "conference call", no spatial sound
1135 ;vivox_channel_type = positional
1136
1137 ; channel characteristics (unless you know what you are doing, i'd
1138 ; leave them as they are --- now you WILL muck around with them,
1139 ; huh? sigh)
1140
1141 ; channel distance model:
1142 ; 0 - no attenuation
1143 ; 1 - inverse distance attenuation
1144 ; 2 - linear attenuation (default)
1145 ; 3 - exponential attenuation
1146 ;vivox_channel_distance_model = 2
1147
1148 ; channel mode:
1149 ; - "open" (default)
1150 ; - "lecture"
1151 ; - "presentation"
1152 ; - "auditorium"
1153 ;vivox_channel_mode = "open"
1154
1155 ; channel roll off: rate of attenuation
1156 ; - a value between 1.0 and 4.0, default is 2.0
1157 ;vivox_channel_roll_off = 2.0
1158
1159 ; channel max range: distance at which channel is silent
1160 ; - a value between 0 and 160, default is 80
1161 ;vivox_channel_max_range = 80
1162
1163 ; channel clamping distance: distance before attenuation applies
1164 ; - a value between 0 and 160, default is 10
1165 ;vivox_channel_clamping_distance = 10
1166
1167[FreeSwitchVoice]
1168 ; In order for this to work you need a functioning FreeSWITCH PBX set up.
1169 ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
1170 enabled = false
1171 ; FreeSWITCH server is going to contact us and ask us all sorts of things
1172 freeswitch_server_user = freeswitch
1173 freeswitch_server_pass = password
1174 freeswitch_api_prefix = /api
1175 ; external IP address of your OpenSim voice enabled region
1176 ; note: all regions running on same OpenSim.exe will be enabled
1177 freeswitch_service_server = ip.address.of.your.sim
1178 ; this should be the same port the region listens on
1179 freeswitch_service_port = 9000
1180 freeswitch_realm = ip.address.of.freeswitch.server
1181 freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
1182 ; STUN = Simple Traversal of UDP through NATs
1183 ; See http://wiki.freeswitch.org/wiki/NAT_Traversal
1184 ; stun.freeswitch.org is not guaranteed to be running so use it in production at your own risk
1185 freeswitch_attempt_stun = false
1186 freeswitch_stun_server = ip.address.of.stun.server
1187 freeswitch_echo_server = ip.address.of.freeswitch.server
1188 freeswitch_echo_port = 50505
1189 freeswitch_well_known_ip = ip.address.of.freeswitch.server
1190 ;
1191 ; Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname
1192 ; This is used by client for account verification. By default, it's the same as the freeswitch service server.
1193 ;
1194 ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed
1195 ;
1196 freeswitch_default_timeout = 5000
1197 freeswitch_subscribe_retry = 120
1198 ; freeswitch_password_reset_url =
1199
1200[Groups]
1201 Enabled = false
1202
1203 ; This is the current groups stub in Region.CoreModules.Avatar.Groups. All the other settings below only really
1204 ; apply to the Flotsam/SimianGrid GroupsModule
1205 Module = Default
1206
1207 ; This module can use a PHP XmlRpc server from the Flotsam project at http://code.google.com/p/flotsam/
1208 ; or from the SimianGrid project at http://code.google.com/p/openmetaverse
1209 ;Module = GroupsModule
1210
1211 ; Enable Group Notices
1212 ;NoticesEnabled = true
1213
1214 ; This makes the Groups modules very chatty on the console.
1215 DebugEnabled = false
1216
1217 ; Specify which messaging module to use for groups messaging and if it's enabled
1218 ;MessagingModule = GroupsMessagingModule
1219 ;MessagingEnabled = true
1220
1221 ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
1222
1223 ; SimianGrid Service for Groups
1224 ;ServicesConnectorModule = SimianGroupsServicesConnector
1225 ;GroupsServerURI = http://mygridserver.com:82/Grid/
1226
1227 ; Flotsam XmlRpc Service for Groups
1228 ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
1229 ;GroupsServerURI = http://yourxmlrpcserver.com/xmlrpc.php
1230
1231 ; XmlRpc Security settings. These must match those set on your backend groups service.
1232 ;XmlRpcServiceReadKey = 1234
1233 ;XmlRpcServiceWriteKey = 1234
1234
1235 ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
1236 ; this is a work around fora problem discovered on some Windows based region servers.
1237 ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
1238 ; System.Net.WebException: The request was aborted: The request was canceled.
1239 ; XmlRpcDisableKeepAlive = false
1240
1241
1242[PacketPool]
1243 ; Enables the experimental packet pool. Yes, we've been here before.
1244 ;RecyclePackets = true;
1245 ;RecycleDataBlocks = true;
1246
1247
1248[InterestManagement]
1249 ; This section controls how state updates are prioritized for each client
1250 ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack
1251 UpdatePrioritizationScheme = FrontBack
1252 ReprioritizationEnabled = true
1253 ReprioritizationInterval = 2000.0
1254 RootReprioritizationDistance = 10.0
1255 ChildReprioritizationDistance = 20.0
1256
1257
1258[WebStats]
1259; View region statistics via a web page
1260; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
1261; Use a web browser and type in the "Login URI" + "/SStats/"
1262; For example- http://127.0.0.1:9000/SStats/
1263; enabled=false
1264
1265[LandManagement]
1266; DefaultAdministratorGroupUUID = "";
1267; DefaultAdministratorParcelName = "";
1268
1269[MediaOnAPrim]
1270 ; Enable media on a prim facilities
1271 Enabled = true;
1272
1273[MOTD]
1274Enabled = false
1275Message = "The MOTD module is working!"
1276
1277
1278;;
1279;; These are defaults that are overwritten below in [Architecture].
1280;; These defaults allow OpenSim to work out of the box with
1281;; zero configuration
1282;;
1283[AssetService]
1284 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1285 AssetLoaderArgs = "assets/AssetSets.xml"
1286
1287 ; Disable this to prevent the default asset set from being inserted into the
1288 ; asset store each time the region starts
1289 AssetLoaderEnabled = true
1290
1291[GridService]
1292 ;; default standalone, overridable in StandaloneCommon.ini
1293 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1294
1295 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1296 ;; The following is the configuration section for the new style services
1297 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1298[Architecture]
1299 ; Choose exactly one and only one of the architectures below.
1300
1301 Include-Standalone = "config-include/Standalone.ini"
1302 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
1303 ;Include-Grid = "config-include/Grid.ini"
1304 ;Include-HGGrid = "config-include/GridHypergrid.ini"
1305 ;Include-SimianGrid = "config-include/SimianGrid.ini"
1306 ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
1307
1308 ; Then choose
1309 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
1310 ; config-include/GridCommon.ini.example (if you're connected to a grid)
1311 ; Copy to your own .ini there (without .example extension) and edit it
1312 ; to customize your data
1313
1314
1315 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1316 ;; The below pulls in optional module config files
1317 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1318[Modules]
1319 Include-modules = "addon-modules/*/config/*.ini"
1320
1321
1322;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1323;; ENSURE [Architecture] and [Modules] Sections with their "includes"
1324;; are last to allow for overrides
1325;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2
new file mode 100644
index 0000000..af73c1e
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/defaultalpha.jp2
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 00be4f9..85b31da 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -544,6 +544,36 @@
544 </Files> 544 </Files>
545 </Project> 545 </Project>
546 546
547 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library">
548 <Configuration name="Debug">
549 <Options>
550 <OutputPath>../../../../bin/Physics/</OutputPath>
551 </Options>
552 </Configuration>
553 <Configuration name="Release">
554 <Options>
555 <OutputPath>../../../../bin/Physics/</OutputPath>
556 </Options>
557 </Configuration>
558
559 <ReferencePath>../../../../bin/</ReferencePath>
560 <Reference name="System"/>
561 <Reference name="System.Core"/>
562 <Reference name="OpenMetaverseTypes.dll"/>
563 <Reference name="Nini.dll" />
564 <Reference name="OpenSim.Framework"/>
565 <Reference name="OpenSim.Framework.Console"/>
566 <Reference name="OpenSim.Region.Physics.Manager"/>
567 <Reference name="Ode.NET.dll" />
568 <Reference name="log4net.dll"/>
569
570 <Files>
571 <Match pattern="*.cs" recurse="true">
572 <Exclude name="Tests" pattern="Tests"/>
573 </Match>
574 </Files>
575 </Project>
576
547 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library"> 577 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library">
548 <Configuration name="Debug"> 578 <Configuration name="Debug">
549 <Options> 579 <Options>
@@ -2334,6 +2364,7 @@
2334 2364
2335 <ReferencePath>../../../../../../bin/</ReferencePath> 2365 <ReferencePath>../../../../../../bin/</ReferencePath>
2336 <Reference name="System"/> 2366 <Reference name="System"/>
2367 <Reference name="System.Core"/>
2337 <Reference name="System.Data"/> 2368 <Reference name="System.Data"/>
2338 <Reference name="System.Web"/> 2369 <Reference name="System.Web"/>
2339 <Reference name="System.Xml"/> 2370 <Reference name="System.Xml"/>