b5a908033c
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-05 06:55:15 +02:00
bdc62144ae
fix the real cause of double velocity
2012-06-05 05:53:44 +01:00
372b76031b
revert last bad commit but fix recoil direction
2012-06-05 05:52:25 +01:00
d9cbe6a16e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-05 05:50:22 +02:00
768447e41b
Stop llRezAtRoot() from applying velocity setting impulse in World.RezObject, doing it only in itself, so its applyed after resuming scripts etc. It was giving twice the requested velocity.
2012-06-05 04:43:23 +01:00
fd8cb45664
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-05 04:00:34 +02:00
170b820a11
Fix land collisions to work like SL.
2012-06-05 01:53:25 +02:00
454445fe6a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-05 00:50:24 +02:00
fd176aab8f
Actually trigger land collisions in the root even when a child collides
2012-06-04 22:41:29 +02:00
b0f6c9330a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-04 21:38:40 +02:00
401b97788f
fix addforce/impulse.
2012-06-04 20:35:12 +01:00
1d75220fcc
Merge branch 'ubitwork' into avination
2012-06-04 21:09:42 +02:00
28e5abd917
Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach positions.
2012-06-04 21:05:56 +02:00
207a5f17b5
When regions are set to shut down the instance, always send notifications to
...
all affected regions and disregard the region id parameter.
2012-06-03 13:43:39 +02:00
928e3e9e21
Fix LSL animation state reporting and animation state transitions on crossing
2012-06-01 23:04:28 +02:00
d8f6faa89e
Fix impersonation, it got broken in a merge
2012-06-01 23:04:13 +02:00
4b3cb91ce8
Remove the kill record. Core has removed it long ago and it really does more harm than good these days
2012-06-01 00:12:04 +02:00
40c0f6a688
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-30 22:37:56 +02:00
cc903992dd
ubitode prim: if makebody() is called already having a body, do a full destrution so there are no 'leaks'.
2012-05-30 21:32:15 +01:00
c548f48791
Guard setting the building flag
2012-05-30 19:32:02 +02:00
0587079115
Whitespace fix
2012-05-30 19:25:52 +02:00
86f786d673
Prevent multiple requests to go physical from reaching the physics plugin
2012-05-30 16:10:01 +02:00
4358bb8f85
Fix the log standing attach-from-world bug.
2012-05-30 00:50:47 +02:00
927e026b6d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-29 20:14:39 +02:00
3e9a831e87
fix physics not reporting collisions only with terrain
2012-05-29 19:13:27 +01:00
100d2968c4
Add advanced collision processing into ScenePresence
2012-05-29 17:24:17 +02:00
10e9ad0086
Fix collision filtering
2012-05-29 16:56:04 +02:00
4f08dae24b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-28 23:25:51 +02:00
dbbfe0cdd7
fix avatars collisions on sim crossings and other few cases where freemove() is called
2012-05-28 22:23:32 +01:00
2122c336b0
a bit cleaner code (?) on sculpts/meshs meshing checking
2012-05-28 14:44:06 +01:00
60cebe9a5b
let meshs work indenpendently of mesh_sculpted_prim config option
2012-05-28 14:32:16 +01:00
657dbb51af
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-28 14:17:28 +02:00
5141f4075f
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-28 13:13:01 +01:00
121433d03a
disable collision sounds for now
2012-05-28 13:10:02 +01:00
20baa6334c
revert making sculpts phanton if sculpt meshing option is off
2012-05-28 13:05:50 +01:00
b70fb7df78
Place the return back into collision sounds.
2012-05-28 11:28:46 +02:00
ca3b229e94
If a region is not found on a simulator, make the health query return
...
0 to indicate it's still starting rather than an error. There are other
methods that can discover the presence of a region and slow starting regions
may cause the watchdog to kill them while they start,
2012-05-28 09:15:24 +02:00
c5e73c0cb8
Merge branch 'ubitwork' into avination
2012-05-28 02:19:29 +02:00
bbaf450c30
Modify SceneManeger to use a DoubleDictionary and work without locks.
...
Changes to the scenes dictionary are exceedingly rare and using atomic
operations makes the chance of collisions nearly nil in any case.
2012-05-28 02:14:14 +02:00
f740c9522a
Let OOB information usable outside ubitode
2012-05-27 14:01:42 +01:00
d2260423e5
also don't collide sculps or meshs if meshing is OFF
2012-05-21 17:11:19 +01:00
b92ecc5382
Merge branch 'avination' into ubitwork
2012-05-21 12:47:28 +01:00
4bbd5fa800
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-21 13:37:34 +02:00
85f5789993
try to let avas climb higher steps. Will only work in some cases, may have bad effects, so needs some more testing
2012-05-21 12:35:17 +01:00
7305d2e0ef
Merge branch 'ubitwork' into avination
2012-05-21 07:32:27 +02:00
32e63fc04f
missing update script events call
2012-05-20 17:30:01 +01:00
11f582b26d
minor changes
2012-05-20 13:18:15 +01:00
e6d228dc0d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 19:16:17 +02:00
2767574d0f
fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable value ( 1m);
2012-05-19 18:10:44 +01:00
944f2c57fa
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 17:37:56 +02:00
ubit