Justin Clark-Casey (justincc)
2ff301ca11
Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom
2013-02-02 01:34:49 +00:00
Justin Clark-Casey (justincc)
9588328242
Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead.
2013-02-02 00:59:26 +00:00
teravus
d8d4e7f236
Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.
2013-02-01 15:42:24 -05:00
Robert Adams
5bb85a14d4
BulletSim: fix problem where editting a physical linkset caused the
...
child prim physical positions to get out of sync with the view.
More reliably compute the offset of children in a physical linkset.
2013-02-01 11:52:27 -08:00
Robert Adams
75a05c16c5
BulletSim: fix crash caused when linksets were rebuilt. A problem added
...
when individual child pos/rot changes were implementated a week or so ago.
Remove some passing of inTaintTime flag when it was never false.
2013-01-31 15:56:10 -08:00
Robert Adams
ed71c939fc
BulletSim: make sure vehicle physical properties are set when going
...
physical by delaying setting until pre-step time. Change vehicle.Refresh()
to schedule the pre-step setting.
Comments and updating of TODO list.
2013-01-31 15:56:02 -08:00
Robert Adams
371449db2f
BulletSim: clean up TargetVelocity implementation by using the default defn in the PhysicsActor base class.
2013-01-31 15:55:53 -08:00
Mic Bowman
f984922dfd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-31 14:54:19 -08:00
Mic Bowman
1e0420431f
Move the JsonStore regular expressions to static variables to avoid
...
recompiling on every operation. Added JsonList2Path script function
to simplify array iteration.
2013-01-31 14:53:16 -08:00
Melanie
627600dd68
Merge branch 'master' into careminster
2013-01-31 20:47:49 +00:00
Melanie
6a4c8824ea
Whitespace fix and removing unneccessary parentheses
2013-01-31 20:46:41 +00:00
Melanie
cfa8e9cfa7
Merge branch 'avination' into careminster
2013-01-31 20:36:20 +00:00
Melanie
e497cf6f04
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-31 20:16:45 +00:00
Dan Lake
b659ccfc80
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-31 11:15:22 -08:00
Dan Lake
17440d8a29
Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed.
2013-01-31 11:14:43 -08:00
BlueWall
a8fa8af9fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-30 23:44:06 -05:00
Jak Daniels
fac72d540b
Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-01-30 23:37:02 -05:00
Melanie
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
Mic Bowman
a0ef3df194
Add JsonTestStore to determine if a JsonStore is associated with
...
a particular UUID.
2013-01-30 14:45:03 -08:00
Melanie
d1ebb0a8f9
Change keyframe motion to use a single timer for all objects. This is required
...
to prevent slippage between objects that are meant to move synchronously or
keep their relative positions/rotations.
2013-01-30 15:54:14 +01:00
teravus
52ea6eadae
* This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
2013-01-30 07:34:48 -05:00
teravus
7c4e0ff03c
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
2013-01-30 06:22:05 -05:00
Justin Clark-Casey (justincc)
d42c7afe3f
Add JsonDestroyStore() basic regression test
2013-01-30 05:56:30 +00:00
Justin Clark-Casey (justincc)
5a22efe69c
refactor: Make invocations of json store functions from the regression test simpler
2013-01-30 05:49:28 +00:00
Justin Clark-Casey (justincc)
addf9ada49
Add regression test for script func JsonRemoveValue()
2013-01-30 05:39:34 +00:00
Justin Clark-Casey (justincc)
5ac84a3793
Fix issue where lsl -> c# generation in co-operative termination mode did not correctly handle single statement versions of for, while and do-while loops.
...
Add regression tests to validate the fix.
This problem will not affect the default abort termination mode.
2013-01-30 03:52:22 +00:00
Robert Adams
a61ecee227
BulletSim: fix physics repositioning when under ground to only happen
...
for physical objects. Non-physical objects can go anywhere they want.
2013-01-29 17:04:28 -08:00
Justin Clark-Casey (justincc)
39700445f2
minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests
2013-01-29 04:36:41 +00:00
Justin Clark-Casey (justincc)
ccdf86c737
minor: remove EnableLogging() left over in CoopTerminationTests
2013-01-29 04:35:05 +00:00
Justin Clark-Casey (justincc)
e0f4e91d22
Try ignoring json tests if they can't be run due to being on <=.net 3.5
2013-01-29 04:26:47 +00:00
Justin Clark-Casey (justincc)
fd34a75cde
minor: Tidy up disabled logging on AssetTransactionModule for future use. Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
2013-01-29 04:03:33 +00:00
Justin Clark-Casey (justincc)
77cd74ded6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-29 03:59:38 +00:00
Justin Clark-Casey (justincc)
ca26ff9436
minor: remove some mono compile warnings in XEngine.cs
2013-01-29 03:58:11 +00:00
Robert Adams
47f09ed4c1
BulletSim: enable angular vertical attraction.
...
Increase terrain collision margin to help vehicles from tunneling
into same.
2013-01-28 17:21:13 -08:00
Robert Adams
531d0429d1
BulletSim: first unit test: vehicle angular attraction
2013-01-28 17:08:34 -08:00
Robert Adams
e9aff0a91d
BulletSim: do not zero an avatar's standing velocity if it is standing
...
on a moving object.
Rearrange pre/post action subscription code to put more in locks.
Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings).
Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
2013-01-28 15:11:50 -08:00
Robert Adams
e4c6a19940
BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed to unmanaged code.
2013-01-28 15:11:20 -08:00
Robert Adams
f6380a3ad3
BulletSim: fix the trimming of colliders so only the top 25 are returned.
2013-01-28 09:02:01 -08:00
Melanie
2a558c7346
Change default avatar replacements to be ruth rather than urban male
2013-01-28 01:20:16 +01:00
Melanie
e336c50813
Send moving_end event to scripts when keyframed motion ends.
2013-01-27 23:35:53 +01:00
Robert Adams
b546af9ac2
BulletSim: simplify the initialization of some of the parameters.
...
Disable vertical attraction for vehicles by default (for the moment).
Fix bug where vehicle would go crazy when velocity got above a
certain speed.
2013-01-27 12:50:07 -08:00
Robert Adams
26d4596080
BulletSim: reinstate the supression of rotational velocity for vehicles
2013-01-27 12:50:07 -08:00
Robert Adams
a345a2feb7
BulletSim: add framework for BulletSim unit tests. No tests yet.
2013-01-27 12:50:06 -08:00
Robert Adams
05adf4b30f
BulletSim: disable center-of-mass computation because it does not work yet
2013-01-27 12:50:06 -08:00
Robert Adams
80f0a978db
BulletSim: fix compile error from last commit
2013-01-27 12:50:06 -08:00
Robert Adams
36f401d850
BulletSim: parameterize the value for gravity reduction for ground vehicles on the ground. Set defaults for vehicle factors to one. Debug logging changes.
2013-01-27 12:50:05 -08:00
Robert Adams
ddef8f16e5
BulletSim: first attempt at reporting top colliders
2013-01-27 12:50:05 -08:00
Robert Adams
dd08e1fba6
BulletSim: parameterize several vehicle debugging values: physical linear and angular force factors now default to less than 1 (0.2) vehicle friction and restitution now default to low values
2013-01-27 12:50:05 -08:00
Robert Adams
c44a8e9f92
BulletSim: finish the post step event for physical object actions. Modify vehicle to use post step event for logging.
2013-01-27 12:50:04 -08:00
Melanie
e6e6e8ab15
Merge branch 'avination' into careminster
2013-01-27 01:09:07 +00:00
Melanie
c3d68e7f9d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-01-27 01:09:01 +00:00
Melanie
776cc33541
Prevent items being destroyed by rename operations. Renaming of a wearable also
...
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-01-27 01:07:37 +00:00
Melanie
380b017e32
Prevent items being destroyed by rename operations. Renaming of a wearable also
...
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
2013-01-27 00:20:34 +01:00
Melanie
f1fbb774b6
Reinstate cleaning objects from parcel when avatars sit on them. Instead do it
...
properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
2013-01-26 20:39:17 +01:00
Melanie
1b5d5d7040
Stop temp-on-rez object from being deleted while an avatar sits on them
2013-01-26 18:03:18 +01:00
Melanie
ac1d09bb0c
Merge branch 'teravuswork' into avination
2013-01-26 18:00:43 +01:00
Melanie
8f949513fd
Merge branch 'master' into careminster
2013-01-26 16:58:02 +00:00
teravus
564b513963
* This update is ugly as sin, but it 'fills in the blanks' of your appearance when your inventory items go missing. This repairs appearance from missing wearables immediately on the V1 appearance pipeline, the second login on Firestorm. It only replaces the essential body parts that are missing.. hair, skin, eyes, shape... so if you delete all your wearables, you will rez naked. Anyway, this is still experimental.. I need another day of playing with this to handle all of the situations. One thing that I still need to do is try and get the assets.. and if we can't get the assets for some reason, skip and replace that part of the outfit.
2013-01-26 07:31:54 -05:00
teravus
60eb0f36b3
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-26 07:23:16 -05:00
UbitUmarov
bfac09849f
bug fix: crash when too many collisions on a ode step
2013-01-26 06:12:26 +00:00
Justin Clark-Casey (justincc)
b0cff35d96
Fix issue where the "set terrain texture" console command did not tell the viewers that textures had updated (hence they did not display the changes).
...
Addresses http://opensimulator.org/mantis/view.php?id=6513
2013-01-26 04:27:01 +00:00
Justin Clark-Casey (justincc)
53833babf9
Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so that these can be triggered by future code (not yet implemented).
...
Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused.
An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515
Thanks Garmin Kawaguichi and Signpost Marv.
2013-01-26 03:57:51 +00:00
Justin Clark-Casey (justincc)
8ea112a5b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-26 02:58:10 +00:00
Talun
ceabb1b49a
Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams
...
Correction so that scripts can turn Flexi off as well as on.
2013-01-26 02:55:24 +00:00
Melanie
e28c042dce
Merge branch 'master' into careminster
2013-01-26 01:56:23 +00:00
teravus
5128ae7b86
* This adds llVolumeDetect functionality to the C# implementation of BulletSim.
2013-01-25 20:15:37 -05:00
Justin Clark-Casey (justincc)
c3fb114461
minor: Fix full scene part console report to show proper Light* names rather than all wrongly FlexiDrag
2013-01-26 00:31:50 +00:00
Justin Clark-Casey (justincc)
d6d6618f62
minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable any enabled logging from previous tests
2013-01-26 00:28:45 +00:00
Justin Clark-Casey (justincc)
7a139f8e53
Remove the accidental PrimShapes column that I added back to the SQLite region store
2013-01-25 04:35:06 +00:00
Justin Clark-Casey (justincc)
7789415148
Fix tests by adding DynAttrs add column commands to RegionStore.migrations (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago).
2013-01-25 04:22:32 +00:00
Oren Hurvitz
6daf559fb6
Added unit tests for Dynamic Attributes
2013-01-25 04:03:30 +00:00
Oren Hurvitz
23f0610f0c
Disabled DAExampleModule
2013-01-25 04:03:28 +00:00
Oren Hurvitz
af6a7cf95d
Added DynAttrs to the serialized XML format of prims. When copying prims, use deep copy for DynAttrs.
2013-01-25 04:03:26 +00:00
Oren Hurvitz
86802bcf93
Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes
2013-01-25 04:03:24 +00:00
Oren Hurvitz
fdec05a15e
Stopped storing dynamic attributes in the PrimShape
2013-01-25 04:03:20 +00:00
Oren Hurvitz
8b4441d940
Changed DAMap to be the container of "data stores", which are OSDMaps. Store names must have at least 4 characters.
2013-01-25 04:03:18 +00:00
Oren Hurvitz
918b062866
Added missing DynAttrs references in MySQL
2013-01-25 04:03:15 +00:00
Justin Clark-Casey (justincc)
1650846df3
Lock DAMap rather than encapsulated OSDMap
...
This allows external lockers to preserve atomicity of dynamic attribute changes
2013-01-25 04:03:13 +00:00
Justin Clark-Casey (justincc)
a6d9c26365
Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it
...
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc)
a3e1e6dd61
Implement dynamic attribute persistence on mysql and mssql
...
mssql is untested
2013-01-25 04:03:09 +00:00
Justin Clark-Casey (justincc)
d3095e2649
Add DAExampleModule to demonstrate dynamic attributes
...
This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code.
Every time the object is moved, the move record is updated and the users in the scene alerted
The number of moves is persisted over server restarts in sqlite
2013-01-25 04:03:07 +00:00
Justin Clark-Casey (justincc)
1bd0b06ec1
Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite
2013-01-25 04:03:04 +00:00
Justin Clark-Casey (justincc)
d977bb77cb
Disable json tests for now - I see this is failing on jenkins because mono 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does.
...
Standardize logging in JsonStoreScriptModule and some minor code formatting.
2013-01-25 03:19:56 +00:00
Justin Clark-Casey (justincc)
614d4eda3e
See if getting the registering JsonReadNotecard with MethodInfo works around an apparent issue with registering methods with more than 5 parameters on mono 2.4.3
2013-01-25 03:02:08 +00:00
Justin Clark-Casey (justincc)
4f52acaa83
Increase logging by enabling during test setup rather than during individual tests of for JsonStore
2013-01-25 02:32:38 +00:00
Justin Clark-Casey (justincc)
8c68451856
Enable logging in new json store tests to find out why they fail on jenkins but not locally.
2013-01-25 02:22:24 +00:00
Justin Clark-Casey (justincc)
844e60da0f
Add JsonTestPath() regression test
2013-01-25 02:12:28 +00:00
Justin Clark-Casey (justincc)
f32361d595
Add regression test for JsonSetValue()
2013-01-25 02:08:33 +00:00
Justin Clark-Casey (justincc)
b914fb98c4
minor: remove mono compiler warning in SceneCommandsModule
2013-01-25 01:56:41 +00:00
Justin Clark-Casey (justincc)
ba369c5cfe
Add basic JsonGetValue() regression test.
2013-01-25 01:55:27 +00:00
Justin Clark-Casey (justincc)
f557d7e828
Add basic JsonCreateStore() regression test
2013-01-25 01:48:31 +00:00
Robert Adams
6a5d088197
BulletSim: reduce the force of gravity on ground vehicles when they
...
are on the ground. Makes them a little more stable.
2013-01-24 16:26:04 -08:00
Melanie
0b8bf69470
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-01-25 00:10:32 +00:00
Melanie
c6e6614a44
Merge branch 'avination' into careminster
2013-01-24 23:25:38 +00:00
Robert Adams
a2a32fc844
BulletSim: reduce the zeroing threshold for rotational velocity.
...
Sometimes settling of a vehicle from gravity introduces small
velocities that need to be kept.
2013-01-24 14:36:00 -08:00
Robert Adams
591faac3ac
BulletSim: disable CCD (continuious collision detection) and
...
contact processing threshold since the first didn't solve tunneling
problems but used resources and the latter caused instabilities.
2013-01-24 14:35:42 -08:00
Robert Adams
2cf29c87bc
BulletSim: zero motion on an object that we pop up because it is
...
below terrain. If the position is being corrected because it is out
of bounds, all other movement rules are out the window.
2013-01-24 14:35:23 -08:00
Robert Adams
3ecfddd791
BulletSim: remove exception that can happen when setting physics parameters from the console.
2013-01-24 14:35:05 -08:00
Talun
71f7bfc2ff
Mantis 6508 llHTTPResponse body is incorrectly interpreted by IE
...
This patch html escapes responses going to IE so that they cannot be
interpreted as HTML if the response type is "text/plain". This has no
effect if the reponse type has been set to "text/html" by
osSetContentType
Signed-off-by: nebadon <michael@osgrid.org>
2013-01-24 14:48:20 -07:00
Melanie
789e9901dd
Make llGiveMoney async again. The return value is now the constant 1 to make
...
scripts work properly. Scripts will no longer receive a failure indication through
this return value;
2013-01-24 21:32:25 +01:00