Melanie
f39e4abf0e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
Melanie
34bb2fd015
Make Keyframe motion cross regions again
2013-03-03 12:48:56 +01:00
Melanie
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
Justin Clark-Casey (justincc)
14684116f8
Add regression tests for llGetNotecardLine()
2013-02-28 20:57:03 +00:00
Justin Clark-Casey (justincc)
0e8ec5649e
Get "show modules" console command to obey selected command line region/s
2013-02-27 22:32:14 +00:00
Melanie
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
b8a7c8b26f
Add regression test for llRequestUrl()
2013-02-26 23:36:36 +00:00
Melanie
54ee95dd8e
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
Justin Clark-Casey (justincc)
d0cb4fc326
Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
...
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map]
However, the proper place for such settings would now be [Map]
This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings.
This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
2013-02-25 23:04:38 +00:00
Melanie
e3ea2c4bee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-02-23 20:37:09 +00:00
Justin Clark-Casey (justincc)
a93f06eb88
minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set only for region crossing and not teleport, etc.
2013-02-22 23:08:42 +00:00
Melanie
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Mic Bowman
903b40b47e
Fix the JsonStore path set problem justincc found earlier today and
...
remove the deprecated TestPath functions.
2013-02-19 22:53:46 -08:00
Diva Canto
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Melanie
8c0b9080a4
Fix an issue where the viewer would request the seed cap before
...
there was a handler for it.
2013-02-18 21:09:14 +01:00
teravus
6560d80fa8
* Fix walking to <NaN, NaN, NaN> via autopilot.
2013-02-16 22:54:37 -05:00
Melanie
192e1e7cf0
Merge branch 'master' into careminster
2013-02-16 05:37:12 +00:00
Justin Clark-Casey (justincc)
e9cc22fea4
Add regression test TestSaveNonRootFolderToIar
2013-02-16 00:26:21 +00:00
Melanie
ea8c5ba707
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-15 21:42:16 +00:00
Justin Clark-Casey (justincc)
edb99dcc19
Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength()
...
This is for consistentency with the verb:noun naming approach existing json script functions and other script functions.
Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions.
As agreed with cmickeyb
2013-02-14 21:11:58 +00:00
Robert Adams
5920abbf8d
Add EventManager events triggered when a SOP is added or removed
...
from the physical scene. Invocations added in SceneObjectPart.
2013-02-14 09:48:11 -08:00
Melanie
a5a56a8755
Merge branch 'avination' into careminster
2013-02-14 09:12:27 +00:00
Melanie
ef662fc959
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 09:11:57 +00:00
Melanie
d5cd9308d5
Merge branch 'avination' into careminster
2013-02-14 07:45:30 +00:00
Melanie
9d55a2298d
Merge branch 'master' into careminster
2013-02-14 07:45:23 +00:00
Melanie
32c4e1a850
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 08:40:15 +01:00
Mic Bowman
bcb172301d
Adds a couple requested functions to the JsonStore script
...
interface. JsonPathType returns the type of node pointed to by the
path and deprecates the functionality of both JsonTestPath
functions. JsonArrayLength returns the length of an array node.
2013-02-13 07:14:04 -08:00
Melanie
d5b401a478
Revert "Make keyframes use the sim's frame timer"
...
This reverts commit e85a6237bf
2013-02-12 22:20:16 +01:00
Melanie
14c064c65d
Revert "Push updates from keyframe directly to the front of the output queue rather"
...
This reverts commit 04235e58e8
2013-02-12 03:15:40 +01:00
Melanie
04235e58e8
Push updates from keyframe directly to the front of the output queue rather
...
than through the update system.
2013-02-12 01:02:16 +01:00
Melanie
e85a6237bf
Make keyframes use the sim's frame timer
2013-02-11 23:49:05 +01:00
Melanie
e31bc8dc96
Refactor KeyframeMotion to use one timer class per scene
2013-02-11 23:07:04 +01:00
Melanie
12f732fd3f
Merge branch 'master' into careminster
2013-02-10 20:01:51 +00:00
Melanie
6f3dcf58b8
Fix code to check for no spawn points. Possibly a merge artefact?
2013-02-10 20:00:39 +00:00
BlueWall
adedd70c35
Fix teleport/telehub issue:
...
Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
2013-02-10 13:01:33 -05:00
Melanie
12971e73d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-02-08 23:29:47 +00:00
Justin Clark-Casey (justincc)
c2bf91c5e3
If a component of a coalesced object fails to deserialization, do not add a null where the object should be.
...
This prevents a later load IAR failure.
This code is currently only used by IAR loading.
2013-02-08 02:45:30 +00:00
Melanie
8008938550
Actually plumb the new values to physics.
2013-02-07 23:36:23 +00:00
Melanie
86ded35afa
Merge branch 'master' into careminster
2013-02-07 23:35:30 +00:00
Melanie
a2dad09172
Actually plumb the new values to physics.
2013-02-07 23:34:47 +00:00
Melanie
22675e6b14
Add some more code from Avination. This changes physics actor stuff around
...
to work with the new params. Not actually plumbed just yet.
2013-02-07 23:22:00 +00:00
Melanie
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
Melanie
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
Melanie
bbda7b94b3
Rename Bounciness to Restitution
2013-02-07 21:25:55 +00:00
Melanie
9089757ea2
Revert "Add plumbing for physics properties to get to the physics engine."
...
This reverts commit c658fa1c0d
2013-02-07 21:05:58 +00:00
Robert Adams
c658fa1c0d
Add plumbing for physics properties to get to the physics engine.
...
Addition of entries to PhysicsActor and setting code in SceneObjectPart.
2013-02-07 11:10:15 -08:00
Melanie
6aa876a83b
Rename Bounciness to Restitution
2013-02-07 03:40:48 +00:00
Melanie
6504e3d4ce
Rename "Bounciness" to "Restitution"
2013-02-07 03:30:02 +00:00
Melanie
375114bea3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-07 01:40:11 +00:00
Mic Bowman
e17392acbb
Enables script access to the per object dynamic attributes through the JsonStore
...
script functions. Adds JsonAttachObjectStore to associate a store identifier with
an object (scripts can only access the store in their host object, this could be
extended but isn't necessary for now).
Note this opens a method to the DAMap OSDMap. This will be removed later, but
greatly simplifies the code for now.
The JsonStore and these scripts are disabled by default.
2013-02-06 17:29:17 -08:00
