053e7279ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-14 02:11:13 +01:00
20b66cf654
Removed more spammy NPC crap
2012-08-14 03:02:43 +02:00
4bbdcfb5ee
Implement the temp attachments. UNTESTED
2012-08-14 01:45:02 +01:00
12a329eb85
Comment spammy debug
2012-08-14 02:28:23 +02:00
9b014a7167
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
9bd2c1b88a
As per lindn spec, disable detach and drop for temp attachments
2012-08-14 01:12:27 +01:00
62acfabec4
Add the skeleton for the temp attachments module
2012-08-14 00:54:12 +01:00
50db8649aa
Exclude temp attachemnts from being sent to the avatar service
2012-08-14 00:29:39 +01:00
fe4c3a37c0
Lay some groundwork for temp attachments. Decouple attachments from inventory.
2012-08-14 00:12:15 +01:00
2a5077ef7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-13 19:20:47 +01:00
58c630c18e
attempt at replicating behaviour of llList2thing functions in SL
...
Committed with changes. Please don't sign comments with your name. Please
don't use your own coding style, use the OpenSim project style. Please
don't modify unrelated whitespace.
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-13 19:17:19 +01:00
93e3ab3ebd
Merge branch 'master' into careminster
2012-08-11 17:32:30 +01:00
3ecd39068c
Merge branch 'bulletsim7'
2012-08-10 16:35:00 -07:00
3a55d5b123
BulletSim: actually update the DLLs and SOs
2012-08-10 16:34:22 -07:00
0c7ce4fc98
BulletSim: many, many detailed logging messages for physical linkset
...
debugging.
Linkset bugs fixed where accounting of children would get lost.
Moved scene based vehicle tracking logic from prim to the scene.
Added GetCollisionFlags2 method to BulletSimAPI.
Updated DLLs and SOs.
2012-08-10 16:22:44 -07:00
3ca770cd2c
BulletSim: Add module names to DetailLog output. Fix some problems with linksets that were caused by checking data structures that are changed regularly from taint time code -- resulted in linksets not being unlinked properly.
2012-08-10 08:33:09 -07:00
320982cae3
BulletSim: add an identifier to the TaintObject call so exceptions that happen when the taint is invoked can be debugged
2012-08-09 15:17:19 -07:00
38e79b80a8
BulletSim: separate out the constraints by type. The linksets use
...
6dof constraint but eventually others will be exposed so future
features can use all the Bullet capabilities.
Force children to generate a position update when unlinked.
2012-08-09 15:01:05 -07:00
6ed3761147
Merge branch 'master' into careminster
2012-08-09 02:37:49 +01:00
5ab151c2d6
BulletSim: add avatar code to keep avatars from ending up trapped under the terrain
2012-08-08 13:48:49 -07:00
19417fca41
BulletSim: Added avatar capsule scaling for size of avatar.
...
This also fixes computation of avatar mass.
Added parameter MaxPersistantManifoldPoolSize.
Fixed a parameter setting bug which caused crashes of there were
more than 400 or so physical objects. I tested up to 5000.
Updated BulletSim DLLs and SOs.
2012-08-07 17:15:06 -07:00
fef07b807d
Merge branch 'avination' into ubitwork
2012-08-07 21:59:21 +01:00
96922543b4
Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster into avination
2012-08-07 20:49:49 +01:00
1c51ae662c
Release http-in URLs when llResetScript is called
2012-08-07 20:49:26 +01:00
d85c49c98b
Merge branch 'master' into careminster
2012-08-07 20:48:57 +01:00
926c0b90a1
Release http-in URLs when llResetScript is called
2012-08-07 20:48:22 +01:00
85b4eab005
Merge branch 'master' into careminster
2012-08-07 20:20:28 +01:00
0e343d6785
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-07 18:43:28 +02:00
eef6bb97c0
use a bit more complex mesh key identifier, plus a bug fix
2012-08-07 17:42:29 +01:00
4adb3471ac
BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
2012-08-06 12:55:52 -07:00
ba5a2dc7b3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-06 12:05:17 +02:00
df2f9b1885
*** TESTTTTT ** downgrade from .net 4.0 to .net3.5
2012-08-06 11:04:29 +01:00
4ae3536066
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-06 10:11:34 +02:00
36a1248b31
** DANGER someone should stress test more ** release unused physics meshs, including unmanaged memory allocations (allocated by managed code)
2012-08-06 09:06:46 +01:00
e5cce8468e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-05 14:00:00 +02:00
307c45af2a
bug fix: keep sculpt bitmaps border pixels during resolution scaling.
...
let this eventually have diferent interpolator last steps on each direction as sl seems to do.
2012-08-05 12:54:34 +01:00
dba37c8d45
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-05 11:41:26 +02:00
493309d91a
ubitmeshing: mask out mirror and invert bits on sculpttype convertion.
...
Remove some unused
2012-08-05 10:37:25 +01:00
8d5cce3138
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-04 18:59:08 +02:00
92d44446fa
*feature test* ubitode, let convex hull shape type work for prims other
...
than uploaded meshs, making it change the mesh level of detail from high to low.
This will work on all prims that get a internal mesh or sculpts. Mesh size
reduction will depend on particular shape. This is not as SL. There prims
do also get concave areas. Uploaded meshs work as before. A normal 10x10x10 torus gets 152 vertices in place of 900, and 198 faces in place of 1198.
2012-08-04 17:33:14 +01:00
8ad1d79003
fix build on win
2012-08-04 11:07:30 +01:00
dfb77330a8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
2012-08-04 11:42:59 +02:00
1b7a720b9f
update ode.dll for windows so both 32b and 64b are now version 0.12 (32b
...
is just a rebuild)
2012-08-04 10:36:50 +01:00
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
374ebab574
Strip experimental tag from --publish option of "save oar" region console command
2012-08-03 23:54:17 +01:00
fb91ca6f1d
Fix old regression that stopped saving parcel owner data in OARs.
...
This was working in 0.7.2 but was accidentally removed from 0.7.3.
The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info.
Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
2012-08-03 23:49:34 +01:00
2724cf685e
Fix build break.
2012-08-03 23:13:19 +01:00
8730dc9d6a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-03 15:10:55 -07:00
d5cd60131f
BulletSim: update DLLs and SOs
2012-08-03 15:10:00 -07:00
e7ad6ed3a3
BulletSim: pass collision subscription information to the C++ code so collisions on objects that don't care are not reported up.
2012-08-03 15:09:56 -07:00
Melanie