Robert Adams
804b332d45
BulletSim: Add banking and other new code to vechile dynamics. Add third party license and contributor in for for Aurora-Sim project for physics code.
2012-11-03 21:12:46 -07:00
Melanie
9eb39406ad
Prevent a null client from crashing windlight.
2012-11-03 20:35:09 +01:00
Diva Canto
783443705d
HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder with parentID=UUID.Zero
2012-11-03 12:03:47 -07:00
Melanie
d0473b73da
Merge branch 'master' into careminster
2012-11-03 15:38:47 +00:00
UbitUmarov
e642b80a79
actually remove the use of random on persist timmings
2012-11-02 17:49:54 +00:00
UbitUmarov
b8c19fe1a9
Create a new random when needed using normal time based seed instead of
...
reusing a shared one than may not be valid
2012-11-02 17:40:17 +00:00
Melanie
fd2bee8da1
Squash reporting HelloNeighbor exception - it simply means the other sim
...
is down, no need for yellow ink.
2012-11-02 16:43:38 +01:00
Diva Canto
7412795a0b
HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE.
2012-11-02 08:05:56 -07:00
UbitUmarov
e36a700eb0
add debug position on bad primmesh error
2012-11-02 14:02:57 +00:00
UbitUmarov
c2639bef8e
lock unique and uniqueReleased in same order when both locks are needed
2012-11-02 10:14:08 +00:00
Dan Lake
2e106cd5de
Change to earlier commit for TargetVelocity to support distributed physics.
2012-11-02 03:09:04 -07:00
Melanie
d383bcc0dc
Merge branch 'ubitwork' into avination
2012-11-02 10:59:04 +01:00
Justin Clark-Casey (justincc)
ce7beb6f20
Add [AssetService] AllowRemoteDeleteAllTypes (default false).
...
This allows a closed grid to delete asset types other than maptile remotely.
Only operational if AllowRemoteDelete = true also.
Defaults to false - do not enable if anybody other than you can make asset service requests.
2012-11-02 01:41:38 +00:00
Justin Clark-Casey (justincc)
462ad336dc
Move check to allow only deletion of maptiles up to AssetServerDeleteHandler from AssetService.
...
This allows us to use a common check for both AssetService and XAssetService.
It also allows future console commands to delete an asset.
As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
2012-11-02 00:02:10 +00:00
Melanie
cbe43c15ec
Merge branch 'ubitwork' into avination
2012-11-01 22:25:29 +01:00
Melanie
e7a6328ea4
Merge branch 'master' into careminster
2012-11-01 15:52:32 +00:00
Justin Clark-Casey (justincc)
8dfe59d7b8
Comment out checks not to overwrite existing IAR/OAR files for now on "save iar/oar" since this causes problems for some backup systems.
...
Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
2012-11-01 03:42:15 +00:00
Justin Clark-Casey (justincc)
a7d9f5598f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-01 03:34:11 +00:00
Justin Clark-Casey (justincc)
ccb17eab71
Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit version from libopenmetaverse commit 3731ee4
...
This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain! Long term alternative is probably to build a fat binary with both architectures.
2012-11-01 03:31:30 +00:00
Dan Lake
ffe4d738fb
Add TargetVelocity to PhysicsActor interface to support distributed physics. No change to existing functions.
2012-10-31 17:13:18 -07:00
Melanie
a2c6094324
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc)
566aaef1f4
Also add the additional ScriptException constructor necessary to get [Serializable] to work.
2012-10-31 00:56:41 +00:00
Justin Clark-Casey (justincc)
b3072cf343
Mark ScriptException as [Serializable] for when it has to cross AppDomains
2012-10-31 00:46:07 +00:00
Justin Clark-Casey (justincc)
4ba48151b2
Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously rather than synchronously.
...
This is to avoid the entire scene loop being held up when the group service is slow to respond.
There's no obvious reason for these queries to be sync rather than async.
2012-10-31 00:39:45 +00:00
Justin Clark-Casey (justincc)
6235d16c31
Make "show object part" command correctly display script status.
...
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
2012-10-31 00:31:18 +00:00
Melanie
28a4ea73ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/ChildAgentDataUpdate.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-10-31 00:13:33 +00:00
Melanie
3388534ff5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-10-30 23:14:06 +00:00
Melanie
fd9cb3cb68
Store and send the current movement animation state to a new sim on crossing
2012-10-30 23:08:22 +00:00
Melanie
9e05067a4f
Add AnimState to CADU
2012-10-30 22:11:02 +00:00
Melanie
ff61d59e60
Add AnimState to CADU
2012-10-30 21:45:39 +01:00
Melanie
5328808b18
Make sure we're not accessing a physics scene if we're not in one yet.
2012-10-30 21:19:00 +01:00
UbitUmarov
e6c8eca504
Merge branch 'avination' into ubitwork
2012-10-30 19:42:32 +00:00
Justin Clark-Casey (justincc)
984faf24df
Only create a new list to check if objects have reached targets if there actually are any targets.
2012-10-30 01:48:05 +00:00
Justin Clark-Casey (justincc)
ff6c69000e
Log warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceived() callback.
...
Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated.
2012-10-30 01:40:59 +00:00
Melanie
4eaa64d863
Merge branch 'avination' into careminster
2012-10-30 01:29:51 +00:00
Melanie
d15d71a7ef
Put back the collision sound shim into SOP
2012-10-30 01:28:03 +00:00
Justin Clark-Casey (justincc)
9bc4dc6c5f
Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining the situations in which AssetRetrieved may be called back with a null AssetBase.
...
These situations include asset not found and remote service not responding.
2012-10-30 01:19:32 +00:00
Justin Clark-Casey (justincc)
cccf695327
Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exception.
...
In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
2012-10-30 01:14:48 +00:00
Justin Clark-Casey (justincc)
37de965233
Make MeshAssetReceived private.
...
Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity.
2012-10-30 01:08:00 +00:00
Justin Clark-Casey (justincc)
aeeed29d62
correct ODEPrim.MeshAssetReveived -> MeshAssetReceived
2012-10-30 01:07:14 +00:00
Melanie
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
SignpostMarv
a09cba6da3
refactoring to use assembly:classname style of configuration
2012-10-29 23:39:01 +00:00
SignpostMarv
a16ddbee41
Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
2012-10-29 23:39:01 +00:00
SignpostMarv
e308841de9
SianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.StopSound rather than setting gain to zero
2012-10-29 23:39:01 +00:00
SignpostMarv
e0b5a3cd90
tweaking configuration logic so that the INonSharedRegionModule will load by default
2012-10-29 23:39:01 +00:00
SignpostMarv
2bb0419251
documenting some params on ISoundModule methods
2012-10-29 23:39:01 +00:00
SignpostMarv
dcac2a7f71
refactoring llCollisionSound to use new KeyOrName method
2012-10-29 23:39:01 +00:00
SignpostMarv
a9999a9676
Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
2012-10-29 23:39:01 +00:00
SignpostMarv
56965dd959
fixing poorly-formatted xml doc string for Util.IsInsideBox
2012-10-29 23:39:00 +00:00
SignpostMarv
ef15711089
refactoring llTriggerSoundLimited to not use the LSL methods, since that will cause unnecessary calls to m_host.AddScriptLPS(1)
2012-10-29 23:39:00 +00:00