Diva Canto
142f8a4aec
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-25 21:00:19 -08:00
Melanie
edc78defed
Zero force and torque on take so that items don't run away when rezzed
2012-02-26 02:52:08 +01:00
Melanie
e9120890a2
Merge branch 'ubitwork'
2012-02-26 02:41:41 +01:00
Melanie
c82709c0d6
Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.
2012-02-26 02:36:34 +01:00
UbitUmarov
e07440d0c5
changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
2012-02-25 22:20:25 +00:00
BlueWall
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
UbitUmarov
7b6649177e
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-25 17:51:12 +00:00
Melanie
6386fdcda7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
2012-02-25 16:24:01 +00:00
PixelTomsen
01f454242d
PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
...
http://opensimulator.org/mantis/view.php?id=5763
2012-02-25 15:33:33 +00:00
Melanie
5eb1679367
Delay the sending of the initial werables update until the inventory and
...
VFS in the viewer are ready. We're much faster than SL and that exposes this
race condition. Also reinstate the extra avatar data send on login
2012-02-25 12:25:16 +01:00
Justin Clark-Casey (justincc)
4a5f9fe6a2
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
2012-02-25 04:26:32 +00:00
Justin Clark-Casey (justincc)
6159110258
Remove some more unused Bullet libraries.
2012-02-25 04:22:59 +00:00
Justin Clark-Casey (justincc)
ca19b9078f
Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin.
2012-02-25 03:36:43 +00:00
Justin Clark-Casey (justincc)
6138662716
Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.
2012-02-25 03:25:56 +00:00
Justin Clark-Casey (justincc)
3fbcd21916
Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like these were once connected with HttpServer.dll but are now unused.
2012-02-25 03:12:41 +00:00
Justin Clark-Casey (justincc)
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
Justin Clark-Casey (justincc)
f9066e7d86
Establish a distsrc nant target for producing the source distribution.
...
This is in addition to the distbin target. The distbin target now needs distsrc to be run first.
Still needs some extra tweaking that I shall eventually put in as sed invocations or similar.
2012-02-25 00:36:28 +00:00
PixelTomsen
7b5e42c744
llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
2012-02-24 23:10:41 +00:00
UbitUmarov
efbfa832bb
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-24 22:25:13 +00:00
UbitUmarov
23679c3808
replace bad meshs by a small cube and log it.
2012-02-24 20:34:11 +00:00
Melanie
70b4bc8cf5
Merge branch 'ubitwork'
2012-02-24 19:48:39 +01:00
Melanie
991826ca76
Try not to send the avatar updates on login. This may mean loggin in with
...
invisible attachments again but could help the appearance issues.
2012-02-24 19:31:27 +01:00
UbitUmarov
ec94b82f51
stop using useless geom tricallback.
2012-02-24 18:25:43 +00:00
Melanie
95f43ab73e
Add a cache on GridService requests
2012-02-24 18:17:30 +01:00
Melanie
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
bafef292f4
Take watchdog alarm calling back outside the m_threads lock.
...
This is how it was originally. This stops a very long running alarm callback from causing a problem.
2012-02-24 05:25:18 +00:00
Justin Clark-Casey (justincc)
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
Justin Clark-Casey (justincc)
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
Justin Clark-Casey (justincc)
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
Justin Clark-Casey (justincc)
fe229f10e6
In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set speed.
2012-02-24 04:08:59 +00:00
UbitUmarov
5145980c74
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-24 02:13:43 +00:00
PixelTomsen
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
Justin Clark-Casey (justincc)
f034958bdc
Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.
...
This should resolve http://opensimulator.org/mantis/view.php?id=5901
2012-02-23 23:11:47 +00:00
Melanie
daf58575f8
Partially apply the core banlines fix
2012-02-23 23:05:04 +00:00
Justin Clark-Casey (justincc)
90ea00a109
Try to resolve some problems with viewers crashing after hitting parcel banlines or freezing on the banline.
...
This involves
1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport()
2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1
This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else.
This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
2012-02-23 22:56:42 +00:00
Melanie
e7cebaa4bd
Merge branch 'master' into careminster
2012-02-23 22:50:31 +00:00
Melanie
e74bf46007
Prevent a nullref when nonphysical motion objects cross sim boundaries
2012-02-23 23:18:01 +01:00
Melanie
7c520cf531
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-23 22:27:20 +01:00
Melanie
1c0adfa6e0
Correct sit position calculations
2012-02-23 22:26:17 +01:00
Melanie
f3ea2bde61
Fix preserving the animation state of a crossing seated avatar
2012-02-23 20:32:35 +01:00
UbitUmarov
8994ab1336
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-23 14:50:49 +00:00
Melanie
dc835717d6
Properly sequence updates of avatars and attachments so that we don't
...
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
2012-02-23 14:08:35 +01:00
Melanie
f266c54f82
Merge branch 'ubitwork'
2012-02-23 13:10:02 +01:00
Melanie
56cc573d2f
Show avatars as sitting on proot prims only to avoid motion jitter
...
for passengers
2012-02-23 12:20:20 +01:00
BlueWall
af377470e1
Merge branch 'master' into v3_support
2012-02-22 22:29:30 -05:00
UbitUmarov
e827bcaf2b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-23 02:04:16 +00:00
Melanie
f1a76195ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-23 01:49:14 +00:00
Melanie
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
Melanie
1dfc990264
Add a position parameter to region crossing of objects. This avoids the
...
potential bad update that places an object at the opposite side of the
origin sim for a moment before actually crossing it. Especially important in
grids like OSG where lag between sims is high.
2012-02-23 01:40:30 +00:00
UbitUmarov
15bc539bd4
fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1.
2012-02-23 00:50:07 +00:00