aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-223-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-221-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-222-5/+7
| | | | | | | | owned by the same user.
* | Merge branch 'master' into careminsterMelanie2012-03-226-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 ↵Melanie2012-03-221-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 Canto2012-03-221-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-223-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-213-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-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-212-2/+5
| | | | | | | | true|false" command
| * Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-211-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 ↵UbitUmarov2012-03-211-7/+10
| | | | | | | | checksculpload ( to reload mesh on change )
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-211-10/+17
|\ \
| * | 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-211-17/+26
| | |
* | | Tell physics about physics shape when creating. Added some virtual methods ↵UbitUmarov2012-03-211-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 careminsterMelanie2012-03-205-180/+197
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * remove unnecessary tmpFrameMS, use maintc instead for frame time calculationJustin Clark-Casey (justincc)2012-03-201-3/+2
| |
| * 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-204-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 careminsterMelanie2012-03-201-1/+1
|\ \ | |/
| * 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.
* | Merge branch 'ubitwork'Melanie2012-03-202-6/+31
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | add some more notifications about changes on physical parameters ( still ↵UbitUmarov2012-03-202-10/+13
| | | | | | | | | | | | 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-203-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-201-11/+5
| |
| * Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| |
| * Add some doc about the EventManager.OnLoginsEnabled event.Justin Clark-Casey (justincc)2012-03-191-0/+7
| |
* | Merge branch 'ubitwork'Melanie2012-03-192-0/+158
|\ \
| * | some more work on costsUbitUmarov2012-03-162-0/+158
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-185-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 Canto2012-03-172-55/+0
| | | | | | | | UserManagementModule where it belongs. No functional changes.
| * Region access control! Region operators can now specify things like ↵Diva Canto2012-03-171-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 Canto2012-03-162-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-162-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'Melanie2012-03-154-19/+82
|\ \
| * | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-152-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 ↵UbitUmarov2012-03-143-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 careminsterMelanie2012-03-151-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-151-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..UbitUmarov2012-03-131-6/+46
| |
* | let PhysicsShapeType none remove physics remove physics on child parts ↵UbitUmarov2012-03-131-10/+38
| | | | | | | | **UnTested**
* | bug fixUbitUmarov2012-03-131-2/+2
| |
* | let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy ↵UbitUmarov2012-03-131-1/+1
| | | | | | | | with it disabled...
generated by cgit v1.1 at 2024-11-14 03:36:32 +0000