Mic Bowman
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
UbitUmarov
a725b5e01e
Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs.
2012-02-27 20:08:43 +00:00
Melanie
960c575dd2
Merge branch 'ubitwork'
2012-02-27 10:35:38 +01:00
Melanie
aee4ca2f1c
Fix vehicles going physical stopping llTargetOmega parts (boat radar)
2012-02-27 08:50:19 +01:00
Melanie
d342008e5b
Fix NPC appearance setting to include attachments again
2012-02-27 08:49:19 +01:00
UbitUmarov
0d51c42f59
update ubitODE to my current working state
2012-02-27 02:10:03 +00:00
UbitUmarov
f451f67213
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-27 01:31:29 +00:00
Melanie
d46235f5a3
Merge branch 'ubitwork'
2012-02-26 21:17:31 +01:00
Melanie
e5e5b94cbe
Make llSetKeyframedMotion prims waut at the borders of down sims and try again
...
periodically.
2012-02-26 21:16:24 +01:00
UbitUmarov
d8ecc28df5
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-26 18:43:56 +00:00
UbitUmarov
118986f150
added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data.
2012-02-26 17:51:43 +00:00
Melanie
fca8c82232
Move KeyframeMotion from SOG to SOP because we can't persist it any
...
other way because SOG doesn't technically exist in the DB
2012-02-26 18:11:38 +01:00
Melanie
356603fff9
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
2012-02-26 15:15:47 +01:00
Melanie
ac1e30156a
Implement proper selection behavior
2012-02-26 15:09:00 +01:00
Melanie
416f39a561
Implement KeyframedMotion selection behavior
2012-02-26 15:06:05 +01:00
Melanie
8cdc115c91
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
...
code.
2012-02-26 14:30:24 +01:00
Melanie
9a15bba99b
Fix an infinite recursion caused by checking the wrong values for
...
Buoyancy, Force and Torque
2012-02-26 13:31:29 +01:00
Melanie
aa552d0526
Serialize Keyframe motion for region crossings
2012-02-26 12:29:35 +01:00
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