57b51287ae
Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge
2011-10-25 02:15:06 +01:00
f387e84e51
Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge
2011-10-25 02:15:01 +01:00
353f0c0e03
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 02:14:39 +01:00
585f1b189f
Merge
2011-10-25 02:08:43 +01:00
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
3cdea11e29
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
2011-10-25 01:54:07 +01:00
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
9dd7d9c16c
Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge
2011-10-25 01:53:24 +01:00
28d2103439
Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge
2011-10-25 01:53:02 +01:00
e43e1b49db
Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge
2011-10-25 01:52:54 +01:00
077e3500b2
Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge
2011-10-25 01:52:42 +01:00
a09e72c8cc
Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge
2011-10-25 01:52:26 +01:00
63cbdb9b2a
Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge
2011-10-25 01:52:19 +01:00
3eb51e9a79
Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmerge
2011-10-25 01:52:12 +01:00
2d4ba1a871
Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmerge
2011-10-25 01:52:00 +01:00
f4e4026a7a
Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge
2011-10-25 01:51:49 +01:00
fe014a05ac
Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge
2011-10-25 01:51:37 +01:00
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
24e260744a
Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge
2011-10-25 01:51:06 +01:00
69b480770a
Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:50:55 +01:00
b4395143e7
Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:50:07 +01:00
0a65e7cadc
Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmerge
2011-10-25 01:47:38 +01:00
be3939358b
Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:47:35 +01:00
506769c6a2
Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge
2011-10-25 01:43:27 +01:00
53caaa8236
Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmerge
2011-10-25 01:43:12 +01:00
747786aac0
Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge
2011-10-25 01:43:05 +01:00
d68b73bfba
Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge
2011-10-25 01:42:56 +01:00
a8cc81a37e
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 01:42:52 +01:00
9ceb98344a
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
2011-10-25 01:37:11 +01:00
13d635d1d7
Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge
2011-10-25 01:37:01 +01:00
8e69dde397
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:36:39 +01:00
0b833c458a
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
2011-10-25 01:35:51 +01:00
b8352c153b
Merge commit '36e73dbc9b7fb46885865f5537c43a29239fd559' into bigmerge
2011-10-25 01:35:38 +01:00
080a41e9f9
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
2011-10-25 01:35:30 +01:00
5f025d20fe
Fix ground sit autopilot
2011-10-25 00:53:39 +02:00
4a6160e7ad
Fake an AgentCircuitData if none is available rather than crashing out
2011-10-24 18:22:36 +02:00
8cca9fe23c
Allow updating the movement animation while flying. This fixes falling,
...
splatting and ground sit. Walking to a ground sit still doesn't work.
2011-10-21 03:15:56 +02:00
fd0e65b0b1
Fix up the animator and ScenePresence to like each other again
2011-10-20 23:11:53 +02:00
bbd0e68c06
Guard HGAssetService against uninitialized variables and null arguments.
2011-10-15 20:23:26 -07:00
b9930a6305
improve method doc on Scene.OtherRegionUp()
...
this is really just to trigger panda.
2011-10-15 03:17:58 +01:00
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
2011-10-15 02:47:27 +01:00
3843efe478
Restore [Startup] physical_prim flag which can stop any prims being subject to physics
...
This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed.
Default for this flag is true as previously.
2011-10-15 02:42:43 +01:00
f2889d7ce9
remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate()
2011-10-15 02:12:46 +01:00
732e937379
refactor: Remove redundant code in SOP.UpdatePrimFlags()
2011-10-15 02:07:05 +01:00
c93c9ea072
factor common code out into SOP.RemoveFromPhysics()
2011-10-15 02:02:39 +01:00
978fb3d482
reduce access to ODECharacter methods to make code analysis easier. Eliminate redundant argument on ProcessTaints()
2011-10-15 01:41:39 +01:00
9cc2694776
restrict unnecessary access levels on ODEPrim fields/properties
2011-10-15 01:31:09 +01:00
f2132329a3
refactor: make methods that do not need to be public in ODE private or internal to aid code reading/analysis. Remove some unused method arguments
2011-10-15 01:20:40 +01:00
Melanie