Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -74/+0 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Remove deprecated parameters for region_id. | Michelle Argus | 2012-09-22 | 1 | -74/+0 |
| | | | | | | | | Remove deprecated parameters for region_id as anounced in january 2012. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -0/+7 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs | ||||
| * | Support multi-region OAR files | Oren Hurvitz | 2012-09-14 | 1 | -0/+7 |
| | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end. | ||||
* | | When regions are set to shut down the instance, always send notifications to | Melanie | 2012-06-03 | 1 | -6/+30 |
| | | | | | | | | all affected regions and disregard the region id parameter. | ||||
* | | If a region is not found on a simulator, make the health query return | Melanie | 2012-05-28 | 1 | -4/+13 |
| | | | | | | | | | | | | 0 to indicate it's still starting rather than an error. There are other methods that can discover the presence of a region and slow starting regions may cause the watchdog to kill them while they start, | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| | | | | | | | | corresponding RemoteAdmin parameter | ||||
* | | Add the ability to abort a pending restart using the viewer UI or a | Melanie | 2012-01-28 | 1 | -1/+19 |
| | | | | | | | | RemoteAdmin message | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -210/+190 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | ||||
| * | Allow RemoteAdmin to deal with all the different kinds of region id ↵ | Justin Clark-Casey (justincc) | 2012-01-06 | 1 | -215/+191 |
| | | | | | | | | | | | | | | parameter that have been used in different methods. See http://opensimulator.org/mantis/view.php?id=5814 Thanks Michelle Argus! | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | addresses mantis #5827 | nebadon | 2011-12-19 | 1 | -1/+1 |
| | | | | | | | | | | RAdmin - admin_save_oar fails if noassets parameter missing thanks Michelle Argus | ||||
| * | Remove a left over log output | Melanie | 2011-12-08 | 1 | -2/+1 |
| | | |||||
* | | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 1 | -8/+0 |
| | | |||||
* | | Remove superfluous try block | Melanie | 2011-12-08 | 1 | -27/+14 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Remove warning in admin_save_oar xmlrpc method where noassets == true was ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1/+1 |
| | | | | | | | | comparing against an object rather than a string | ||||
| * | Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -2/+2 |
| | | | | | | | | success = true on success rather than false | ||||
| * | Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1711/+1370 |
| | | | | | | | | of code to do password checks, etc., instead of copy/pasting this code into every method | ||||
* | | Adapt to justincc's remote admin refactor | Melanie | 2011-12-08 | 1 | -1744/+1394 |
| | | |||||
* | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 1 | -0/+113 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -0/+113 |
| | | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position. | ||||
* | | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge | Melanie | 2011-10-25 | 1 | -21/+41 |
|\ \ | |/ | |||||
| * | RemoteAdmin - Added optional terrain loading on region create using ↵ | Michelle Argus | 2011-10-21 | 1 | -21/+41 |
| | | | | | | | | parameter heightmap_file to specify the terrain file to be loaded | ||||
* | | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge | Melanie | 2011-10-12 | 1 | -39/+1 |
|\ \ | |/ | |||||
| * | Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -39/+1 |
| | | | | | | | | | | | | check on XMLRPC RemoteAdmin handlers. If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway. | ||||
* | | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge | Melanie | 2011-10-12 | 1 | -5/+5 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | ||||
| * | replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -5/+4 |
| | | | | | | | | HashSet | ||||
* | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 1 | -124/+116 |
|\ \ | |/ | |||||
| * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -124/+116 |
| | | | | | | | | | | | | Also adds password check to some functions where this was missing and fixes some parameter checking. This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me. Thanks Michelle Argus. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership. | ||||
* | | | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Turn off keepalives when commands are specified | Mic Bowman | 2011-10-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+8 |
|\ \ | |/ | |||||
| * | Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -1/+8 |
| | | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=5686 Thanks Michelle Argus! | ||||
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+13 |
|\ \ | |/ | |||||
| * | Reattaching a region was failing if the estate name had not changed (issue ↵ | Kevin Houlihan | 2011-09-16 | 1 | -4/+13 |
| | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones. | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | Added a check to the CreateRegion method of the RemoteAdmin module that the ↵ | Kevin Houlihan | 2011-09-09 | 1 | -0/+13 |
| | | | | | | | | | | | | specified user exists. A meaningful exception message is returned if the user is not found. Previously it was returning "Object not set..." | ||||
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -2/+39 |
|\ \ | |/ | |||||
| * | Add profile, merge, noassets and skip-assets options for loading/saving oars ↵ | Justin Clark-Casey (justincc) | 2011-07-02 | 1 | -2/+39 |
| | | | | | | | | | | | | | | via RemoteAdmin This is http://opensimulator.org/mantis/view.php?id=5453 Thanks Michelle Argus! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -0/+56 |
|\ \ | |/ | |||||
| * | Mantis #5442: Add admin_save_heightmap | Melanie | 2011-04-17 | 1 | -0/+56 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -89/+107 |
|\ \ | |/ | |||||
| * | Make remote admin error messages more helpful on windows. | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -88/+73 |
| | | | | | | | | Also, make log messages conform more with convention. | ||||
| * | Thanks Snoopy for a patch that allows setting of perms on items given to new ↵ | BlueWall | 2011-04-15 | 1 | -1/+34 |
| | | | | | | | | avatars | ||||
* | | Fix status responses in remote admin | Melanie | 2010-12-03 | 1 | -2/+2 |
| | |