| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ↵ | Diva Canto | 2012-03-17 | 2 | -55/+0 |
| | | | | | | | | | UserManagementModule where it belongs. No functional changes. | ||||
| | * | Region access control! Region operators can now specify things like ↵ | Diva Canto | 2012-03-17 | 1 | -2/+2 |
| | | | | | | | | | DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector. | ||||
| | * | Terrain: added [Terrain] section with an option to load an initial flat ↵ | Diva Canto | 2012-03-16 | 2 | -18/+53 |
| | | | | | | | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning. | ||||
| | * | Replace script-lines-per-second with the script execution time scaled by its ↵ | Justin Clark-Casey (justincc) | 2012-03-16 | 2 | -38/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | measurement period and an idealised frame time. The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute. Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100. The actual measurement value should be script execution time per frame but XEngine does not work this way. Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time. This is still not ideal but gives reasonable results and allows scripts to be compared. This commit moves script execution time calculations from SceneGraph into IScriptModule implementations. | ||||
| * | | Merge branch 'ubitwork' | Melanie | 2012-03-15 | 4 | -19/+82 |
| |\ \ | |||||
| | * | | added ObjectPhysicsProperties http event message to send viewer that data. ↵ | UbitUmarov | 2012-03-15 | 2 | -1/+2 |
| | | | | | | | | | | | | | For now on caps/EventQueue, and still only used on a material change... | ||||
| | * | | bug fixs, added a default physics shape estimator based on being a mesh or ↵ | UbitUmarov | 2012-03-14 | 3 | -18/+80 |
| | | | | | | | | | | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-15 | 1 | -10/+1 |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Fix a problem where multiple near simultaneous calls to llDie() from ↵ | Justin Clark-Casey (justincc) | 2012-03-15 | 1 | -10/+1 |
| | | | | | | | | | | | | | | | | | | | | | multiple scripts in the same linkset can cause unnecessary thread aborts. The first llDie() could lock Scene.m_deleting_scene_object. The second llDie() would then wait at this lock. The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away. Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead. This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event. | ||||
| * | | missed commit of extraphysics parameters serialization.. | UbitUmarov | 2012-03-13 | 1 | -6/+46 |
| | | | |||||
| * | | let PhysicsShapeType none remove physics remove physics on child parts ↵ | UbitUmarov | 2012-03-13 | 1 | -10/+38 |
| | | | | | | | | | **UnTested** | ||||
| * | | bug fix | UbitUmarov | 2012-03-13 | 1 | -2/+2 |
| | | | |||||
| * | | let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy ↵ | UbitUmarov | 2012-03-13 | 1 | -1/+1 |
| | | | | | | | | | with it disabled... | ||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-13 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Ensure child prims of a phantom prim are marked as phantom | Melanie | 2012-03-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵ | UbitUmarov | 2012-03-13 | 4 | -17/+205 |
| |/ / | | | | | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc | ||||
| * | | Refactor, move OjectChangeData into it's own file and rename | Melanie | 2012-03-13 | 4 | -149/+37 |
| | | | | | | | | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type! | ||||
| * | | Restore duplication of the SL bug where linking phantom to solid lets the | Melanie | 2012-03-12 | 1 | -3/+2 |
| | | | | | | | | | child prim remain phantom | ||||
| * | | allocate UndoRedoStore only on demand | UbitUmarov | 2012-03-12 | 1 | -10/+17 |
| | | | |||||
| * | | Physical phantoms testable with chOde. Volume detection was changed and ↵ | UbitUmarov | 2012-03-11 | 1 | -138/+145 |
| | | | | | | | | | also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED *** | ||||
| * | | bug fix (??) in sog copy() | UbitUmarov | 2012-03-11 | 1 | -10/+19 |
| | | | |||||
| * | | cleanup + comments | UbitUmarov | 2012-03-11 | 1 | -167/+52 |
| | | | |||||
| * | | coments change.. | UbitUmarov | 2012-03-11 | 1 | -3/+3 |
| | | | |||||
| * | | minor changes on updates control on doChangeObject(..) | UbitUmarov | 2012-03-11 | 1 | -10/+48 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-11 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |