aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-2556-412/+495
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ↵Justin Clark-Casey (justincc)2012-11-243-106/+83
| | | | | | | | | | | | functionally identical. Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
| * Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a ↵Justin Clark-Casey (justincc)2012-11-241-7/+12
| | | | | | | | BasicInventoryAccessModule() and re-enable in test suite.
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-2444-45/+46
| | | | | | | | automatically turns off any logging enabled between tests
| * In ArchiverTests, use the local instantiated SceneManager rather than ↵Justin Clark-Casey (justincc)2012-11-241-20/+7
| | | | | | | | potentially cross-contaminating tests by relying on the static SceneManager.Instance
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-247-213/+300
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
| * minor: Add some currently commented out debug log lines for investigating ↵Justin Clark-Casey (justincc)2012-11-231-0/+5
| | | | | | | | issues resolving group IDs for land parcels on OAR loading where groups do not exist
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-11-232-3/+3
| |
| * minor: Make note in log if scene was restarted due to an unrecoverable ↵Justin Clark-Casey (justincc)2012-11-231-1/+6
| | | | | | | | physics error
| * Add AllowRegionRestartFromClient setting to [EstateManagement] section of ↵Justin Clark-Casey (justincc)2012-11-231-40/+63
| | | | | | | | | | | | | | | | | | OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically.
* | Merge branch 'careminster' into avinationMelanie2012-11-237-33/+129
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-11-237-33/+129
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| | * minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | | | | | region restart if done from the viewer.
| | * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-234-36/+51
| | | | | | | | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
| | * Add regression test for checking scene close when SceneManager is asked to closeJustin Clark-Casey (justincc)2012-11-231-0/+58
| | |
* | | Remove duplicate registration of the help topics for the module commanderMelanie2012-11-231-5/+5
|/ /
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
| | | | | | | | where core has a simple list
* | Merge branch 'master' into careminsterMelanie2012-11-231-0/+7
|\ \ | |/
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
| | | | | | | | | | If we don't do this, then these scenes don't get deregistered from the grid, amongst other things. Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
* | Merge branch 'master' into careminsterMelanie2012-11-2211-54/+54
|\ \ | |/
| * Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because itMelanie2012-11-2211-54/+54
| | | | | | | | conflicts with PhysicsShape type defined in later libOMV
* | Merge branch 'master' into careminsterMelanie2012-11-223-223/+30
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-36/+0
| | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-223-171/+29
| |
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-221-16/+1
| | | | | | | | This helpfully lists version information, startup location and console log level
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-221-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-221-7/+35
|\ \
| * | * While this is not producing any problems.. and does help in low bandwidth ↵teravus2012-11-221-7/+35
| | | | | | | | | | | | situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
* | | Merge branch 'master' into careminsterMelanie2012-11-2212-321/+713
|\ \ \ | | |/ | |/|
| * | BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-216-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | Simple attempt to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height calculation. A little better but short avatar's feet are above the terrain and tall avatar's feet are a little below the ground.
| * | BulletSim: Properly position mesh terrain on creation (fixes terrain not ↵Robert Adams2012-11-212-76/+44
| | | | | | | | | | | | appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
| * | BulletSim: add terrainImplementation parameter with default to Mesh.Robert Adams2012-11-213-5/+46
| | |
| * | BulletSim: fix line endings to be all Linux style (windows style keeps ↵Robert Adams2012-11-212-454/+454
| | | | | | | | | | | | creeping in)
| * | BulletSim: enablement and debugging of mesh terrain.Robert Adams2012-11-214-36/+253
| | |
| * | BulletSim: pull heightmap implementation out of the terrain manager so a ↵Robert Adams2012-11-214-181/+327
| | | | | | | | | | | | mesh terrain can be implemented.
| * | BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ↵Robert Adams2012-11-214-8/+8
| | | | | | | | | | | | having mesh avatars.
| * | BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is ↵Robert Adams2012-11-213-20/+22
| | | | | | | | | | | | getting simplified out of existance someday) and update all the references to same.
| * | BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is ↵Robert Adams2012-11-219-66/+67
| | | | | | | | | | | | getting simplified out of existance someday) and update all the references to that enum.
| * | BulletSim: change PositionSanityCheck to apply a force to correct position ↵Robert Adams2012-11-212-33/+30
| | | | | | | | | | | | corrections (below ground and floating).
| * | BulletSim: tweek avatar capsule parameters so avatar feet don't go below ↵Robert Adams2012-11-212-8/+10
| | | | | | | | | | | | ground. This solves the bouncing, short avatar problem (Mantis 6403).
* | | Merge branch 'master' into careminsterMelanie2012-11-205-196/+169
|\ \ \ | |/ /
| * | If GetAgents() is called with an empty userIDs array then don't bother with ↵Justin Clark-Casey (justincc)2012-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | | a useless potentially network call on the scene presence service connector. This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
| * | refactor: Move common presence connector code into BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| | |
| * | Minor formatting for 0962a35d and a few one-line comments as to why that ↵Justin Clark-Casey (justincc)2012-11-201-8/+7
| | | | | | | | | | | | code is there
| * | Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-11-205-18/+99
|\ \ \ | | |/ | |/|
| * | Merge branch 'teravuswork' into avinationMelanie2012-11-206-73/+491
| |\ \
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-175-18/+99
| | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution.
| | * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-15159-15158/+6023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
generated by cgit v1.1 at 2024-12-28 16:48:33 +0000