aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Add a newline before the constant help textMelanie2012-11-231-0/+1
| |
* | Revert help to display a full command list. Leave the help categories in asMelanie2012-11-231-5/+6
| | | | | | | | "help categories" in case it turns out useful in the future. May not work.
* | 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-1/+28
|\ \ | |/
| * Add "help all" console command which will list all commands alphabetically ↵Justin Clark-Casey (justincc)2012-11-231-1/+28
| | | | | | | | in a single 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-2212-706/+604
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-223-77/+50
| | | | | | | | 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-226-189/+172
| |
| * Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-223-62/+50
| | | | | | | | Log path at which pid file is created or reason for failure to create.
| * Add "get log level" command - this returns the current server session ↵Justin Clark-Casey (justincc)2012-11-221-19/+31
| | | | | | | | | | | | console logging level. This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
| * Remove unused BaseOpenSimServer.ShowHelp()Justin Clark-Casey (justincc)2012-11-221-21/+0
| |
| * Make "set log level" command available across all serversJustin Clark-Casey (justincc)2012-11-223-32/+31
| |
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-224-237/+185
| | | | | | | | This helpfully lists version information, startup location and console log level
| * Factor out common registration of "show uptime" commandJustin Clark-Casey (justincc)2012-11-223-71/+78
| |
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-229-63/+72
| |
* | 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-223-48/+66
|\ \ \ | | |/ | |/|
| * | refactor: Factor out copy/pasted server uptime report codeJustin Clark-Casey (justincc)2012-11-223-48/+66
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-2214-324/+835
|\ \ \ | |/ /
| * | If an asset POST does not contain well-formed XML, return a 400 (Bad ↵Justin Clark-Casey (justincc)2012-11-222-3/+38
| | | | | | | | | | | | Request) HTTP status rather than simply dropping the request.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-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).
| * | | Add regression test for a good request made to the asset service post handler.Justin Clark-Casey (justincc)2012-11-211-0/+84
| |/ / | | | | | | | | | Adds new OpenSim.Server.Handlers.Tests.dll to test suite
* | | Merge branch 'master' into careminsterMelanie2012-11-206-198/+174
|\ \ \ | |/ /
| * | 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
| | |
| * | minor: If logging full incoming HTTP data, don't deceptively print ... at ↵Justin Clark-Casey (justincc)2012-11-201-2/+5
| | | | | | | | | | | | the end of the body.
* | | Merge branch 'avination' into careminsterMelanie2012-11-208-19/+127
|\ \ \ | | |/ | |/|