| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-23 | 1 | -14/+29 |
| |\ | | | | | | | careminster | ||||
| | * | Make anims way more snappy. Decouple SP animation handling from physics frame | Melanie | 2012-03-23 | 1 | -14/+29 |
| | | | | | | | | | time. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -14/+77 |
| |\ \ | |||||
| | * | | Add a scene maintenance thread in parallel to the heartbeat thread. The ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -14/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | maintenance thread will end up running regular jobs that don't need to be in the main scene loop. The idea is to make the critical main scene loop as skinny as possible - it doesn't need to run things that aren't time critical and don't depend on update ordering. This will be done gradually over time to try and uncover any issues. Many non-criticial scene loop activities are being launched on separate threadpool threads anyway. This may also allow modules to register their own maintenance jobs without having to maintain their own timers and threads. Currently the maintenance loop runs once a second, as opposed to the 89ms scene loop. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 2 | -56/+70 |
| |\ \ \ | |/ / | | / | |/ |/| | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -17/+20 |
| | | | | | | | | | method doc. Rename HeartbeatThread, shuttingdown to conform to code standards. | ||||
| | * | Rename Scene.StartTimer() to Start() - this method no longer uses a timer. ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -24/+25 |
| | | | | | | | | | Comment out more effectively unused old heartbeat code. | ||||
| | * | Fix build break | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -1/+1 |
| | | | |||||
| | * | Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e | Justin Clark-Casey (justincc) | 2012-03-23 | 2 | -3/+3 |
| | | | | | | | | | Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase. | ||||
| | * | Comment out unused scene loop restart code. | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -19/+22 |
| | | | | | | | | | This has actually been unused since at least 0.7.2 due to earlier changes. | ||||
| | * | Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -2/+2 |
| | | | | | | | | | m_lastUpdate is no longer properly updated and is redundant anyway. | ||||
| | * | Add commented out section on collisions switch in Scene.SetSceneCoreDebug(). | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -0/+6 |
| | | | | | | | | | This was not implemented before the recent changes but should be at some point. | ||||
| | * | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+8 |
| | | | | | | | | | MoveTaskInventoryItem() | ||||
| * | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 3 | -10/+12 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Fix llGiveInventory() so that it checks the destination part for ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case. | ||||
| | * | Add llGiveInventory() test from object to object where both objects are ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 2 | -5/+7 |
| | | | | | | | | | owned by the same user. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 6 | -102/+190 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵ | Melanie | 2012-03-22 | 1 | -17/+0 |
| | | | | | | | | | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9. | ||||
| | * | Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵ | Diva Canto | 2012-03-22 | 1 | -0/+17 |
| | | | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. | ||||
| | * | refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 3 | -6/+6 |
| | | | | | | | | | clarity since non-default animations are handled completely separately from this class | ||||
| | * | Instead of loading default avatar animations in both SLUtil and ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -24/+79 |
| | | | | | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit"). | ||||
| | * | If "debug scene updates true" then print out to log when a garbage ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -0/+3 |
| | | | | | | | | | collection occurs. | ||||
| | * | Add Scene.DebugUpdates switch which, if turned on, will print out a warning ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -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-21 | 2 | -2/+5 |
| | | | | | | | | | true|false" command | ||||
| | * | Replace "scene debug true false true" console command with "scene debug ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -25/+30 |
| | | | | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings. | ||||
| * | | fix a bad reset of shapetype on pbshape change, added missing ↵ | UbitUmarov | 2012-03-21 | 1 | -7/+10 |
| | | | | | | | | | checksculpload ( to reload mesh on change ) | ||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-21 | 1 | -10/+17 |
| |\ \ | |||||
| | * | | Move the health monitoring stuff where it will do some good | Melanie | 2012-03-21 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -7/+14 |
| | |\ \ | | |/ | |||||
| | | * | Add ability to log warn if a frame takes longer than twice the expected ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -7/+14 |
| | | | | | | | | | | | | | time. Currently commented out. | ||||
| * | | | Changes of PrimShapeType should now work with UbitOde ( almost untested ) | UbitUmarov | 2012-03-21 | 1 | -17/+26 |
| | | | | |||||
| * | | | Tell physics about physics shape when creating. Added some virtual methods ↵ | UbitUmarov | 2012-03-21 | 1 | -0/+2 |
| |/ / | | | | | | | 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 ) | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 5 | -180/+197 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | remove unnecessary tmpFrameMS, use maintc instead for frame time calculation | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+2 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| | |\ | |||||
| | | * | slight increase in jump power to make running jump slightly better. | nebadon | 2012-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Move frame loop entirely within Scene.Update() for better future performance ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 4 | -168/+191 |
| | |/ | | | | | | | | | | | | | | | 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 careminster | Melanie | 2012-03-20 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | reduce avatar verticle jump from the absurd 5 meter jump to a less | nebadon | 2012-03-20 | 1 | -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. | ||||
| * | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 2 | -6/+31 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | add some more notifications about changes on physical parameters ( still ↵ | UbitUmarov | 2012-03-20 | 2 | -10/+13 |
| | | | | | | | | | | | | | incomple and there should be a better away ) | ||||
| * | | | Cover the case where prims are loaded and ParentGroup is not yet set | Melanie | 2012-03-20 | 1 | -5/+10 |
| |/ / | |||||
| * | | Cause prims to be saved if extra physics parameters are changed | Melanie | 2012-03-20 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 3 | -18/+12 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs | ||||
| | * | Remove pointless ThreadAbortException catching in a test that isn't run anyway. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -11/+5 |
| | | | |||||
| | * | Remove some pointless catching/throwing in the scene loop. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -7/+0 |
| | | | |||||
| | * | Add some doc about the EventManager.OnLoginsEnabled event. | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'ubitwork' | Melanie | 2012-03-19 | 2 | -0/+158 |
| |\ \ | |||||
| | * | | some more work on costs | UbitUmarov | 2012-03-16 | 2 | -0/+158 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 5 | -117/+58 |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |