aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | If "debug scene updates true" then print out to log when a garbage ↵Justin Clark-Casey (justincc)2012-03-211-0/+3
| | | | | | | | | | | | collection occurs.
| * | Add Scene.DebugUpdates switch which, if turned on, will print out a warning ↵Justin Clark-Casey (justincc)2012-03-211-10/+32
| | | | | | | | | | | | | | | | | | | | | 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"
| * | Incorporate scene teleporting debugging into "debug scene teleport ↵Justin Clark-Casey (justincc)2012-03-213-18/+6
| | | | | | | | | | | | true|false" command
| * | Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-213-37/+45
| |/ | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
* | minor cleanUbitUmarov2012-03-211-27/+24
| |
* | fix a bad reset of shapetype on pbshape change, added missing ↵UbitUmarov2012-03-211-7/+10
| | | | | | | | checksculpload ( to reload mesh on change )
* | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ↵UbitUmarov2012-03-211-4/+9
| | | | | | | | may colide with how meshs and sculpts are loaded. This needs a good revision..
* | shapetype support on chOde so it can also request a simple convex hull 'mesh'UbitUmarov2012-03-212-34/+46
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-218-195/+327
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-216-167/+303
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+1
| | |\
| | * | Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-18/+7
| | |\ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2017-232/+264
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| | * | | | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-205-167/+276
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-172-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | direct user connections.
| * | | | | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fix compile error from last commitJustin Clark-Casey (justincc)2012-03-211-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into careminsterMelanie2012-03-211-18/+7
| |\ \ \ \ | | |/ / /
| | * | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()Justin Clark-Casey (justincc)2012-03-211-18/+7
| | | |/ | | |/|
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-215-129/+311
| |\ \ \ | | | | | | | | | | | | | | | careminster
| * | | | Move the health monitoring stuff where it will do some goodMelanie2012-03-211-3/+3
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-03-201-7/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add ability to log warn if a frame takes longer than twice the expected ↵Justin Clark-Casey (justincc)2012-03-211-7/+14
| | | | | | | | | | | | | | | | | | | | time. Currently commented out.
* | | | | Changes of PrimShapeType should now work with UbitOde ( almost untested )UbitUmarov2012-03-212-3727/+3750
| | | | |
* | | | | Tell physics about physics shape when creating. Added some virtual methods ↵UbitUmarov2012-03-215-5/+57
| | | | | | | | | | | | | | | | | | | | 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 )
* | | | | add convex state to mesh key, so a change is detected.UbitUmarov2012-03-211-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'ubitwork'Melanie2012-03-205-129/+311
|\ \ \ \ | |/ / / |/| | |
| * | | let convex be a parameter to createMesh so it can be used. Was forced to add ↵UbitUmarov2012-03-214-7/+21
| | | | | | | | | | | | | | | | it also to original mesher code and zeromesher
| * | | added convex decomposition hulls support. Hardcoded to use mesh or this. ↵UbitUmarov2012-03-201-18/+146
| | | | | | | | | | | | | | | | (so no simple hull of convex prims for now).
| * | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ↵UbitUmarov2012-03-202-124/+164
| | | | | | | | | | | | | | | | 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"
* | | | Merge branch 'master' into careminsterMelanie2012-03-2010-192/+205
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Add prim name to "[MESH]: No recognized physics mesh..." log messageJustin Clark-Casey (justincc)2012-03-201-1/+1
| | | |
| * | | remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-2/+0
| | | |
| * | | remove unnecessary tmpFrameMS, use maintc instead for frame time calculationJustin Clark-Casey (justincc)2012-03-201-3/+2
| | | |
| * | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-1/+1
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-201-1/+1
| |\ \ \
| | * | | slight increase in jump power to make running jump slightly better.nebadon2012-03-201-1/+1
| | | | |
| * | | | Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-206-176/+197
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'master' into careminsterMelanie2012-03-203-12/+24
|\ \ \ \ | |/ / /
| * | | reduce avatar verticle jump from the absurd 5 meter jump to a lessnebadon2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | absurd 3m vertical jump to better match what you would see in Second Life and be more in line with what users would expect.
| * | | refactor: precalculate the fixed movement factor for avatar tilting ↵Justin Clark-Casey (justincc)2012-03-202-8/+16
| | | | | | | | | | | | | | | | (sqrt(2)) rather than doing it multiple times on every move.
| * | | refactor: Eliminate unnecessary duplicate avCapsuleTiltedJustin Clark-Casey (justincc)2012-03-201-3/+7
| | | |
* | | | Merge branch 'ubitwork'Melanie2012-03-203-6/+32
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | add some more notifications about changes on physical parameters ( still ↵UbitUmarov2012-03-203-10/+14
| | | | | | | | | | | | | | | | incomple and there should be a better away )
* | | | Cover the case where prims are loaded and ParentGroup is not yet setMelanie2012-03-201-5/+10
|/ / /
* | | Cause prims to be saved if extra physics parameters are changedMelanie2012-03-201-0/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-206-39/+34
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * | Remove pointless ThreadAbortException catching in a test that isn't run anyway.Justin Clark-Casey (justincc)2012-03-201-11/+5
| | |
| * | Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| | |