ubit
03eb2d6bf4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 21:20:52 +02:00
UbitUmarov
b95caaa453
on presence close(), release animator and OnRegionHeartbeatEnd event
2012-08-03 20:13:51 +01:00
ubit
d259b6e57e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 17:27:59 +02:00
ubit
0549dde3c6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 16:22:34 +02:00
UbitUmarov
a4c59b1fd2
minor change avoiding a null reference
2012-08-03 15:21:29 +01:00
UbitUmarov
879d1cefb8
clientview IsActive use is broken. Suspend it's use keeping it true ( to
...
review later)
2012-08-03 15:19:31 +01:00
Melanie
d677db338d
Remove a merge artefaci in IsActive handling and restore commented out correct one
2012-08-03 15:22:53 +02:00
ubit
8928b8a730
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 11:42:36 +02:00
Melanie
3460319f1e
Make sure the position of a loggin-in agent is within region boundaries since
...
out of bounds positions cause a rejection of the login.
2012-08-03 02:20:57 +02:00
Melanie
d58743ddc1
Add a reason message for a code path that lacks one
2012-08-03 01:30:05 +02:00
ubit
254d3e1ad3
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
2012-08-02 18:21:08 +02:00
ubit
3d68d1deda
i local libs commit
2012-08-02 18:13:59 +02:00
Melanie
ecffcf7f65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2012-08-01 23:03:03 +01:00
Melanie
e36bc0d754
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-01 22:39:40 +01:00
Melanie
cf16ca9bda
Create the ability for physics modules to request assets on demand by
...
themselves. For that, the physics module simply calls RequestAssetMethod, which
in turn points to Scene.PhysicsRequestAsset. This gives physics access to
the asset system without introducing unwanted knowledge of the scene class.
2012-08-01 22:37:38 +01:00
Justin Clark-Casey (justincc)
5f500c89ce
Fix a bug in pCampbot grabbing behaviour where an exception would be thrown if the bot was not yet aware of any objects.
2012-08-01 22:30:34 +01:00
ubit
44255fdde2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-01 15:10:32 +02:00
Justin Clark-Casey (justincc)
69a5beeabc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-01 00:40:31 +01:00
Justin Clark-Casey (justincc)
794363421d
Look up the NPC module when the SensorRepeat class is created, rather than on every single sensor sweep.
2012-08-01 00:39:37 +01:00
Robert Adams
c51ef38e2d
BulletSim: fix problem where resizing a primary shape (cube or sphere) would not rebuild the physics mesh. Update the DLLs and SOs to latest version.
2012-07-31 16:23:52 -07:00
Robert Adams
e38d26a2dc
BulletSim: change boolean parameters in the shape data from int's to float's to be consistant with parameter data structure
2012-07-31 16:23:48 -07:00
Justin Clark-Casey (justincc)
04d8c6b4fe
Change exception log messages in XInventoryService connector to error rather than debug, since these signal real problems.
...
Also outputs full exception instead of just the message to aid diagnostics.
2012-08-01 00:11:21 +01:00
Melanie
8114260946
Merge branch 'master' into careminster
2012-08-01 00:08:02 +01:00
Melanie
70996603e5
Merge branch 'avination' into careminster
2012-08-01 00:07:57 +01:00
Justin Clark-Casey (justincc)
7609daca38
Resolve a deadlock between INPCModule and SensorRepeat by replacing the SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep.
...
A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal.
Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status.
This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
2012-07-31 23:57:57 +01:00
Justin Clark-Casey (justincc)
d89faa3c16
Fix bug in SoundModule.TriggerSound() where every sound update to an avatar would base its gain calculation on the previous avatar's gain, instead of the original input gain.
...
This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
2012-07-31 22:52:17 +01:00
Melanie
ef3166d4fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-31 23:38:47 +02:00
Melanie
e40e1dc9e6
Reverse a senseless change in the prioritizer. Why I would want avatars to render according to their camera position is beyond me.
2012-07-31 23:38:01 +02:00
Mic Bowman
a76a289d11
Adds support to ScriptModuleComms for region modules to export
...
constants to the script engine.
2012-07-31 10:45:37 -07:00
Robert Adams
f9a8915cca
BulletSim: update the DLLs and SOs. This fixes the exception on shutdown
2012-07-31 09:44:32 -07:00
Robert Adams
50dbb9ffe4
BulletSim: add parameters and API calls for setting ERP and CFM.
...
Set ERP and CFM in linkset constraints.
Reorder rebuilding of object bodies so they are not rebuilt everytime
something is linked and unlinked.
2012-07-31 09:23:05 -07:00
Justin Clark-Casey (justincc)
6b1d12edcb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-30 23:25:54 +01:00
Justin Clark-Casey (justincc)
b899d64dc1
If we're fetching active gestures via the XInventoryServiceConnector, then properly look at the ITEMS dictionary already returned rather than the level above this.
2012-07-30 23:14:20 +01:00
ubit
3d7b469c60
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-30 03:20:29 +02:00
Melanie
bd262fe3ed
Correct StandUp position and rotation
2012-07-30 03:05:57 +02:00
Melanie
e012c81d7c
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-29 16:11:20 +01:00
Melanie
277491d871
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-29 16:10:45 +01:00
Melanie
3f6dfa92ab
Return world rotation on llGetObjectDetails()'s OBJECT_ROT
2012-07-29 16:05:35 +01:00
Melanie
88d68e68c1
Return world rotation on llGetObjectDetails()'s OBJECT_ROT
2012-07-29 15:40:31 +02:00
Melanie
30784ab9e1
Fix an exception while outputting a log message
2012-07-29 15:12:03 +02:00
Melanie
659be9dd50
When controls are released by script, don't drop the permission to
...
retake them.
2012-07-29 15:11:39 +02:00
Melanie
729046e1ad
See that if controls are taken, those are released before taking new ones
2012-07-29 15:10:12 +02:00
Melanie
9163cdd7c1
Bump number of URLs to 15000 per region
2012-07-29 15:09:42 +02:00
Melanie
45b72bf01c
Fix some merge issues and a functional issue in the scene manager
2012-07-28 01:06:28 +01:00
ubit
7f5ac795be
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-28 02:03:18 +02:00
Melanie
e60ec599e5
Add master's new binaries
2012-07-28 00:41:31 +01:00
Melanie
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
SignpostMarv
72d29bdb40
LSL/OSSL lacks Math.Min & Math.Max implementations.
2012-07-28 00:09:11 +01:00
Justin Clark-Casey (justincc)
7e89b99e6a
Avoid a race condition between the scene shutdown thread and the update thread since commit c150320
(Thu Jul 26 15:27:18 2012)
...
c150320
started explicitly disposing of the physics scene and nulling it out on region shutdown.
However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation.
This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked.
This should not affect the few other places that use this flag.
2012-07-27 23:58:53 +01:00
SignpostMarv
adbdb220df
making first run more resilient to bad input (loop until good input, rather than crash)
2012-07-27 23:40:19 +01:00