ac1d09bb0c
Merge branch 'teravuswork' into avination
2013-01-26 18:00:43 +01:00
8f949513fd
Merge branch 'master' into careminster
2013-01-26 16:58:02 +00:00
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
60eb0f36b3
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-26 07:23:16 -05:00
fdc26b801e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-26 07:13:39 +01:00
bfac09849f
bug fix: crash when too many collisions on a ode step
2013-01-26 06:12:26 +00:00
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
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
2eab339b87
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-26 04:40:48 +01:00
c58ec342ff
Merge branch 'avination' into ubitwork
2013-01-26 03:16:45 +00:00
8ea112a5b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-26 02:58:10 +00:00
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
e28c042dce
Merge branch 'master' into careminster
2013-01-26 01:56:23 +00:00
5128ae7b86
* This adds llVolumeDetect functionality to the C# implementation of BulletSim.
2013-01-25 20:15:37 -05:00
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
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
7a139f8e53
Remove the accidental PrimShapes column that I added back to the SQLite region store
2013-01-25 04:35:06 +00:00
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
6daf559fb6
Added unit tests for Dynamic Attributes
2013-01-25 04:03:30 +00:00
23f0610f0c
Disabled DAExampleModule
2013-01-25 04:03:28 +00:00
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
86802bcf93
Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes
2013-01-25 04:03:24 +00:00
fdec05a15e
Stopped storing dynamic attributes in the PrimShape
2013-01-25 04:03:20 +00:00
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
918b062866
Added missing DynAttrs references in MySQL
2013-01-25 04:03:15 +00:00
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
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
a3e1e6dd61
Implement dynamic attribute persistence on mysql and mssql
...
mssql is untested
2013-01-25 04:03:09 +00:00
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
1bd0b06ec1
Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite
2013-01-25 04:03:04 +00:00
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
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
4f52acaa83
Increase logging by enabling during test setup rather than during individual tests of for JsonStore
2013-01-25 02:32:38 +00:00
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
844e60da0f
Add JsonTestPath() regression test
2013-01-25 02:12:28 +00:00
f32361d595
Add regression test for JsonSetValue()
2013-01-25 02:08:33 +00:00
b914fb98c4
minor: remove mono compiler warning in SceneCommandsModule
2013-01-25 01:56:41 +00:00
ba369c5cfe
Add basic JsonGetValue() regression test.
2013-01-25 01:55:27 +00:00
f557d7e828
Add basic JsonCreateStore() regression test
2013-01-25 01:48:31 +00:00
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
0b8bf69470
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-01-25 00:10:32 +00:00
c6e6614a44
Merge branch 'avination' into careminster
2013-01-24 23:25:38 +00:00
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
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
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
3ecfddd791
BulletSim: remove exception that can happen when setting physics parameters from the console.
2013-01-24 14:35:05 -08:00
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
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
427ab219b8
Add JSONification of WebStats module. Adds a '?json' query parameter
...
to the fetch URL to return the data in JSON format. Also adds a simple
'sim.html' that uses JavaScript to display the JSON data. Not pretty
but an example.
2013-01-24 10:44:57 -08:00
e785242c49
Reintroduce the return value of llGiveMoney. The grid will crash and burn without it.
2013-01-24 18:23:39 +01:00
Melanie