11ed932263
Tell physics about physics shape when creating. Added some virtual methods to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc )
2012-03-21 01:46:41 +00:00
de53aa32e0
Add Scene.DebugUpdates switch which, if turned on, will print out a warning when a frame updates takes longer than twice the desired time
...
This is controlled via "debug scene updates true|false" on the region console.
Also fix an oversight with "debug scene teleport true|false"
2012-03-21 01:27:09 +00:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
ab243f4a57
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
2012-03-21 01:13:44 +00:00
9671e43497
Replace "scene debug true false true" console command with "scene debug scripting true" or other parameters as appropriate.
...
This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
2012-03-21 01:02:58 +00:00
ee9210f656
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-21 00:26:02 +00:00
7a0d7be44c
Refix the fixed fix!
2012-03-21 00:17:58 +00:00
69a9a6993e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:33:26 -07:00
91a001d3cf
fix compile error from last commit
2012-03-21 00:31:31 +00:00
9e8b194356
Fixed borkness with map search introduce by my last changes to it.
2012-03-20 17:29:34 -07:00
742acc0a3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:26:18 -07:00
f7c61790b7
Fixed borkness with previous merge.
2012-03-20 17:25:52 -07:00
022366a074
refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()
2012-03-21 00:23:46 +00:00
841b4232f6
Line endings
2012-03-20 17:19:55 -07:00
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Framework/Util.cs
2012-03-20 17:19:14 -07:00
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
2012-03-20 17:14:19 -07:00
d3a5cdd7c2
Merge branch 'master' into careminster
2012-03-21 00:09:18 +00:00
250b75f03b
Merge branch 'master' into careminster
2012-03-21 00:03:03 +00:00
7bf628ab31
Add ability to log warn if a frame takes longer than twice the expected time. Currently commented out.
2012-03-21 00:02:08 +00:00
117a862769
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-21 00:01:11 +00:00
5233e335e9
Move the health monitoring stuff where it will do some good
2012-03-21 00:00:32 +00:00
80a3b43e69
Merge branch 'master' into careminster
2012-03-20 23:59:49 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
4c41b53a4b
Add prim name to "[MESH]: No recognized physics mesh..." log message
2012-03-20 23:35:50 +00:00
02f9caf6ce
remove some mono compiler warnings
2012-03-20 23:34:10 +00:00
3701f893d3
remove unnecessary tmpFrameMS, use maintc instead for frame time calculation
2012-03-20 23:31:57 +00:00
c39fba8f9d
minor: remove some mono compiler warnings
2012-03-20 23:19:11 +00:00
8bdd38b804
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 23:14:15 +00:00
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
...
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
2012-03-20 23:12:21 +00:00
4e4a3e8d22
Update prebuild
2012-03-20 23:22:49 +01:00
3d258d2688
Merge branch 'ubitwork'
2012-03-20 23:09:34 +01:00
8817b6e74c
let convex be a parameter to createMesh so it can be used. Was forced to add it also to original mesher code and zeromesher
2012-03-21 00:02:41 +00:00
23e6a31aa5
added convex decomposition hulls support. Hardcoded to use mesh or this. (so no simple hull of convex prims for now).
2012-03-20 23:38:04 +00:00
bd1f848bf6
slight increase in jump power to make running jump slightly better.
2012-03-20 14:17:15 -07:00
fdd4d787a4
Merge branch 'master' into careminster
2012-03-20 20:48:55 +00:00
9ed3532c1b
reduce avatar verticle jump from the absurd 5 meter jump to a less
...
absurd 3m vertical jump to better match what you would see in Second
Life and be more in line with what users would expect.
2012-03-20 13:45:38 -07:00
86bd287b53
refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2)) rather than doing it multiple times on every move.
2012-03-20 20:39:33 +00:00
5f2a65c976
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-20 20:28:58 +00:00
8c1550b58e
WORK in progress!! Now it reads the simple hull shape to use if convex shape is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer"
2012-03-20 19:24:45 +00:00
70c0d6cf0b
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-20 18:07:24 +01:00
7f7801ecb9
Cover the case where prims are loaded and ParentGroup is not yet set
2012-03-20 18:02:43 +01:00
efd7ff3146
add some more notifications about changes on physical parameters ( still incomple and there should be a better away )
2012-03-20 16:46:16 +00:00
f2d17433bb
Cause prims to be saved if extra physics parameters are changed
2012-03-20 12:34:06 +01:00
abd9957198
Fix an invalid cast that only showed at runtime
2012-03-20 12:24:42 +01:00
7779b1eabc
Store and reload extra physics from database
2012-03-20 12:04:55 +01:00
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
a3abd65e3d
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
2012-03-20 01:41:32 +00:00
8c911ddaf0
Remove some pointless catching/throwing in the scene loop.
2012-03-20 01:39:19 +00:00
4cbaf053cf
Fix small typo
2012-03-20 00:53:33 +00:00
1c0f3a1f21
Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at the same time.
...
Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
2012-03-20 00:40:03 +00:00
UbitUmarov