OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,900 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

20900 Commits (4c512ada58532f97baa7a356cec5a2e2720d7466)

Author SHA1 Message Date
Melanie 03ff782c3c Merge branch 'master' into careminster 2012-07-20 22:12:02 +01:00
Robert Adams ca3b6b1f90 BulletSim: more detail logging for vehicle and general physics debugging. 
Physical linksets are fully functional.
Tweeking of the vehicle code to make it semi-work.
Utilize the new API2 for some setting operations.
Add GetOrientation() API call for proper reporting of children of linksets.
Changes the interface between C# and C++ code so old DLLs won't work!
 2012-07-20 14:08:29 -07:00
Robert Adams 24dfb5bcb3 Remove an added but unnecessary dependency in prebuild.xml 2012-07-20 14:07:35 -07:00
Robert Adams 7451bb1613 BulletSim: fix compile errors from last commit. Clean up passing of physics scene into vehicle dynamics code. 2012-07-20 14:02:29 -07:00
Robert Adams cda67a68de BulletSim: Add very detailed logging to BSDynamics for vehicle debugging 2012-07-20 14:02:27 -07:00
Robert Adams e9c437ed0e Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a simple, high performance logger for high frequency logging (physics sub-operations, for instance). 2012-07-20 14:02:26 -07:00
Robert Adams c400918c84 BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon. 
Cleaned up code and got rid of compile warnings.
 2012-07-20 14:02:24 -07:00
Robert Adams f9913b6ef7 BulletSim: Add detailed and voluminous debug logging that is enabled 
with an ini configuration parameter.
Correct computation of relative offsets of children in a linkset.
Remove a prim from any link relationship before deleting it.
Minor code flow cleanups.
 2012-07-20 14:02:22 -07:00
Justin Clark-Casey (justincc) ecf7bb268c As per opensim-dev mailing list discussion, extend llGetDetectedType() to return OS_NPC if an OS npc is detected. 
The detection will also return agent is the NPC has been created with the OS_NPC_SENSE_AS_AGENT option.
 2012-07-20 21:36:33 +01:00
Justin Clark-Casey (justincc) bcfc392edf As per opensim-dev mailing list conversation, introduce OS_NPC constant for use with llSensor() 
This same constant will later be used with llGetDetectedType().
This constant has a different name from NPC to avoid possible conflict with future LSL changes.
This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value.
Using the 'NPC' constant with llSensor() will remain valid but is deprecated.
 2012-07-20 21:08:04 +01:00
Mic Bowman a4281ca014 Enables support for UUIDs to be returned in lists from 
modInvoke commands.

Thanks SignpostMarv!!!
 2012-07-20 10:48:51 -07:00
Mic Bowman 644fb6b013 Implements a very useful OSSL function to test a string to see 
if it is a UUID. The function is osIsUUID().

Thanks SignpostMarv!
 2012-07-20 10:25:50 -07:00
Melanie 1598f9d179 Fix the order of operations on detach. The object must always be serialized 
while still in the scene to avoid losing important script state.
DeleteSceneObject can not be called before doing this!
 2012-07-20 16:45:24 +02:00
Melanie fe99948c58 Fix the order of operations on detach. The object must always be serialized 
while still in the scene to avoid losing important script state.
DeleteSceneObject can not be called before doing this!
 2012-07-20 11:54:59 +02:00
Melanie d98c883f86 Merge branch 'master' into careminster 2012-07-20 10:42:54 +01:00
Melanie df866fd300 Merge branch 'avination' into careminster 2012-07-20 09:35:22 +01:00
Melanie 7da744566d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-20 09:31:06 +01:00
Justin Clark-Casey (justincc) be39f03caa minor: switch around mixed up circuit code and endpoint data in "show connections" region console command 2012-07-19 23:35:56 +01:00
Justin Clark-Casey (justincc) d1d331a4c0 Make LLClientView instant message handling asynchronous rather than synchronous to prevent long operations from holding up all inbound packet processing. 
Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service.
Handling this asynchronously instead stops this delay from disrupting all avatars in the scene.  This has been shown in OSGrid.
I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages.
Thanks to Nebadon for testing this change out.
 2012-07-19 23:20:03 +01:00
Justin Clark-Casey (justincc) c4533e755b Comment out OnIncomingInstantMessage and OnInstantMessage handlers in GroupsModule, since these led to a private blank method 2012-07-19 23:13:08 +01:00
Justin Clark-Casey (justincc) e94831ddab Stop explicitly closing and nulling out Animator in order to prevent NREs in various places due to race conditions. 
Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking.
The memory used is small and these should be GC'd anyway when the SP is released.  If this is not happening then the wider problem of old SPs being retained needs to be resolved.
 2012-07-19 22:59:28 +01:00
Justin Clark-Casey (justincc) ccc7e75ce4 minor: remove some mono compiler warnings 2012-07-19 22:37:48 +01:00
Justin Clark-Casey (justincc) ba80f137b5 Prevent race conditions between two threads that call LLClientView.Close() simultaneously (e.g. ack timeout and an attempt to reconnect) 2012-07-19 22:32:27 +01:00
Justin Clark-Casey (justincc) e9a121e1b2 Add TestCreateDuplicateRootScenePresence() regression test. 2012-07-19 21:54:50 +01:00
Justin Clark-Casey (justincc) c0ab406e2e Add basic TestCreateRootScenePresence() regression test 2012-07-19 21:41:13 +01:00
Melanie 0d595ab19e Merge branch 'ubitwork' into avination 2012-07-19 12:28:50 +02:00
Melanie ce8b9e6c57 Fix slow loading of task inventory 2012-07-19 12:27:36 +02:00
UbitUmarov 0facebec40 Update ubitMesh primMesher with new Dahlia version on core ( reckick git 
back)
 2012-07-19 11:12:53 +01:00
UbitUmarov 5b68bff73b kick git 2012-07-19 11:10:23 +01:00
Melanie 36d744e2a5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-07-19 09:47:51 +01:00
Justin Clark-Casey (justincc) 6dda7c65ae Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup. 
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled
and was affected by a bug where it would never fire if the region started with logins disabled.
 2012-07-19 00:09:22 +01:00
Justin Clark-Casey (justincc) 64db0bcbd2 Add back notification to neighbouring regions when RegionReadyModule is not active accidentally just removed in 528004d 2012-07-18 23:40:00 +01:00
Justin Clark-Casey (justincc) 528004d349 Perform other region ready actions even if simulator is configured to leave logins disabled on startup. 2012-07-18 23:35:05 +01:00
Justin Clark-Casey (justincc) 1971b6bb4f Stop the 15 second initial script compile wait if a script is being rezzed on a previously empty region. 2012-07-18 22:24:52 +01:00
Justin Clark-Casey (justincc) d97e27434c Fix bug where region ready would be triggered a second time if a script was rezzed on a previously script-free region. 
There is no need to listen for OnRezScript in RegionReadyModule since OnEmptyScriptCompileQueue will only fire if scripts were compiled.
 2012-07-18 22:17:39 +01:00
Justin Clark-Casey (justincc) 58b72933c8 Fix bug where region ready was being triggered twice in quick succession if a region contained no scripts. 2012-07-18 22:09:20 +01:00
Justin Clark-Casey (justincc) 4973fddc51 Establish EventManager.OnRegionReady event. This will only be triggerred once when the region is ready. 
Switch MapImageServiceModule to use this.
 2012-07-18 21:52:07 +01:00
Justin Clark-Casey (justincc) 6460e587c4 Pass entire scene object in OnLoginsEnabled event rather than just the region name. 
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
 2012-07-18 21:29:12 +01:00
Justin Clark-Casey (justincc) 742ad5eb93 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-18 21:26:28 +01:00
Dan Lake dd85d7d981 Merge branch 'master' of git://opensimulator.org/git/opensim 2012-07-18 13:07:07 -07:00
Dan Lake 0dd14ca0a3 Missing parameter in log error message was throwing exception 2012-07-18 13:05:48 -07:00
Justin Clark-Casey (justincc) cd6d7429f8 Only listen to LoginsEnabled event in RegionReadyModule if it has been asked to disable logins until all scripts have been compiled 2012-07-18 21:03:35 +01:00
Melanie 4917637ce6 Fix llSameGroup to work according to specs 2012-07-18 14:30:40 +02:00
Justin Clark-Casey (justincc) eb590becf0 Close() the ScenePresence after we've removed it from the scene graph, to cut down race conditions when another thread manages the grab the presence after some SP structures have been reset. 2012-07-18 00:14:02 +01:00
Justin Clark-Casey (justincc) b9749d5aaf Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-17 23:48:53 +01:00
Justin Clark-Casey (justincc) 48a5f10be1 Revert "Revert "refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself."" 
This reverts commit 59a29f5f22.
The original revert was committed by mistake - it turns out this was not the cause of Mantis 6089

Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-17 23:48:09 +01:00
Justin Clark-Casey (justincc) 56870d9609 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-17 23:34:50 +01:00
Justin Clark-Casey (justincc) ecb759c1e5 Fix regression where llGiveInventory() had stopped asking non-owner receivers to accept/decline. 
This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog.
This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway.
This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well
Fixes http://opensimulator.org/mantis/view.php?id=6089
 2012-07-17 23:31:38 +01:00
Justin Clark-Casey (justincc) 59a29f5f22 Revert "refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself." 
This reverts commit 58b13d51a7.
 2012-07-17 22:56:21 +01:00
Melanie c489bc1cd2 Make the scrpt running flag work properly 2012-07-17 15:00:42 +02:00