aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-11-252-2/+5
|\
| * * Fix a null ref error in ↵teravus2012-11-241-0/+3
| | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
| * Remove a superfluous newline from helpMelanie2012-11-231-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-11-2587-640/+960
|\ \ | |/ |/| | | | | | | 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-2465-67/+80
| | | | | | | | 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-2413-239/+609
| | | | | | | | | | | | | | | | | | 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
| * Make "show threads" and "thread abort" console commands available on all serversJustin Clark-Casey (justincc)2012-11-233-108/+103
| |
| * Make "force gc" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-11/+12
| |
| * Make "show version" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-8/+7
| |
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
| |
| * 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
| | |
* | | Fix new command console code to match the output of the original while keepingMelanie2012-11-231-2/+5
| | | | | | | | | | | | the new features
* | | Remove duplicate registration of the help topics for the module commanderMelanie2012-11-231-5/+5
|/ /
* | 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.
generated by cgit v1.1 at 2024-12-18 07:42:42 +0000