6930d696e9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-07-25 18:19:12 +01:00
af05aaaf36
Remove support for the OS_NPC constant. That one seems to be overly paranoid
...
to have and confuses the issue.
2012-07-25 01:28:11 +01:00
3cf8edfd68
Rename "image queues clear" console command to "clear image queues"
...
There is less justification for this word arrangement (verb after noun) now that command help is categorized.
Also removes "image queues show" in favour of existing alias "show image queues".
2012-07-24 23:51:04 +01:00
1427430b7b
Add information about each column to "show queues" region console command help.
2012-07-24 23:48:53 +01:00
ef8570f789
Extend region console "show queues" command to show already collected time since last packeted received by the simulator from a viewer.
2012-07-24 23:39:31 +01:00
c846a5461c
Remove bad using statement in AttachmentsModuleTests.
...
It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails.
2012-07-24 22:46:22 +01:00
c992629576
extend regression TestRezScriptedAttachmentFromInventory() to check actual start of script rather than just the script status reported by SOG.ContainsScripts()
2012-07-24 22:40:06 +01:00
bc13c52c98
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-24 22:38:26 +01:00
2858b1b1f4
extend regression TestDetachScriptedAttachementToInventory() to check correct running status on a re-rezzed attachment
2012-07-24 22:33:54 +01:00
0993af0871
Allow load and save of IAR without a password. The password must still be
...
present on the command line for compatibility, but is ignored.
Avination's IAR operations are administratively done and the staff doesn't
have the passwords of the users.
2012-07-24 11:38:30 +02:00
892dd59b13
BulletSim: update BulletSim.dlls and so's
2012-07-23 16:38:31 -07:00
bf6547be01
BulletSim: change how prim mass is saved so it is always calculated but zero is given if not physical.
2012-07-23 16:32:47 -07:00
dda681515b
BulletSim: small optimizations for link and unlink code
2012-07-23 16:32:41 -07:00
8a574395c7
BulletSim: add Dispose() code to free up resources and close log files.
2012-07-23 16:32:36 -07:00
85c6eb7c50
BulletSim: add all the new functions to BulletSimAPI.
...
Modify ZeroMotion() to not make tainting calls and to use new API calls.
2012-07-23 16:32:30 -07:00
73f9e14b43
BulletSim: improve linking to add each link individually rather than rebuilding the object each time. Makes it an O(n) operation rather than O(n\!).
2012-07-23 16:32:24 -07:00
d69f186f5a
Merge branch 'avination' into careminster
2012-07-23 21:55:18 +01:00
c337a1878c
Merge branch 'master' into careminster
2012-07-23 21:39:52 +01:00
e126915bc1
Change attachment handling to remove object from the scene first as per
...
justincc's original work. Sample scripts before doing so. Also refactor some
crucial common code and eliminate parameters that were only ever used with
the same constant value.
2012-07-23 21:39:26 +01:00
9e00e2ddec
Change attachment handling to remove object from the scene first as per
...
justincc's original work. Sample scripts before doing so. Also refactor some
crucial common code and eliminate parameters that were only ever used with
the same constant value.
2012-07-23 21:08:02 +02:00
82b9e4ffda
Merge branch 'master' into careminster
2012-07-23 19:54:30 +01:00
fc77bca936
Committing Avination's memleak fix-a-thon, installment #3
...
When linking, detach the no longer used SOG's from backup so they can be
collected. Since their Children collection is never emptied, they prevent
their former SOPs from being collected as well.
2012-07-23 19:53:26 +01:00
112df30ea3
Merge branch 'avination' into careminster
2012-07-23 19:32:08 +01:00
5c1ed57d68
Merge branch 'master' into careminster
2012-07-23 19:27:37 +01:00
55c1c10c0d
Committing Avination's memleak fix-a-thon, installment #2
...
Ensure items coming off the lockless queue are released. Also ensure this
is done when the queue is cleared.
2012-07-23 19:26:21 +01:00
7d16d0664e
Commiting Avination's memleak fix-a-thon, installment #1
...
As the MinHeap shrinks, free object references that have been sent. Also,
free the last item when it empties.
2012-07-23 19:21:59 +01:00
7dfd581913
Fix merge issues in prebuild
2012-07-23 19:17:27 +01:00
fb8e92c90b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
2012-07-23 18:54:12 +01:00
b1b3057adc
Fix double-ping on logout by not sending a stop packet to the client
...
if the client told us it wants to log out in the first place.
2012-07-21 20:56:19 +02:00
ac612e2105
Update BulletSim DLLs and SOs
2012-07-20 16:12:54 -07:00
1b1418e1de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-20 23:47:25 +01:00
b537bbc410
Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled before BulletSim is
2012-07-20 15:44:53 -07:00
b25d874afa
BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempting to fix a mono compile error.
2012-07-20 15:34:19 -07:00
ef14232e64
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-20 23:20:40 +01:00
13929613b1
Move RegionConfig.ini.example into bin/Regions/Regions.ini.example - all other example files are in the same directory as their real files.
...
Only files ending in .ini and .xml are actually loaded.
Also improves the help at the top of Regions.ini.example to mention that OpenSimulator would generate Regions.ini anyway on first startup.
2012-07-20 23:18:41 +01:00
03ff782c3c
Merge branch 'master' into careminster
2012-07-20 22:12:02 +01:00
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
24dfb5bcb3
Remove an added but unnecessary dependency in prebuild.xml
2012-07-20 14:07:35 -07:00
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
cda67a68de
BulletSim: Add very detailed logging to BSDynamics for vehicle debugging
2012-07-20 14:02:27 -07:00
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
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
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
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
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
a4281ca014
Enables support for UUIDs to be returned in lists from
...
modInvoke commands.
Thanks SignpostMarv!!!
2012-07-20 10:48:51 -07:00
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
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
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
d98c883f86
Merge branch 'master' into careminster
2012-07-20 10:42:54 +01:00
Melanie