Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 branch 'master' into bigmerge | Melanie | 2011-12-05 | 4 | -15/+15 |
|\ \ | |/ | |||||
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 4 | -15/+15 |
| | | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | ||||
| * | Rename ForEachAvatar back to ForEachScenePresence. The other changes | Dan Lake | 2011-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence. | ||||
| * | Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to | Dan Lake | 2011-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate. | ||||
* | | 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 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Slightly change log message in LoadRegionsPlugin | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -1/+1 |
| | | |||||
* | | Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+13 |
|\ \ | |/ | |||||
| * | Region-UUID - can not be zero-uuid | Pixel Tomsen | 2011-10-19 | 1 | -1/+13 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=3426 | ||||
* | | 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 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge | Melanie | 2011-10-11 | 1 | -30/+0 |
|\ \ | |/ | |||||
| * | Removed uncalled region load method. | Kevin Houlihan | 2011-09-24 | 1 | -30/+0 |
| | | | | | | | | The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module. | ||||
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
| | | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
* | | 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..." | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -9/+9 |
|\ \ | |/ | |||||
| * | early code to allow scripts to force npcs not to fly when moving to target | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -1/+1 |
| | | | | | | | | | | this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path. currently implemented in osNpcMoveToTarget(), but none of this is final. | ||||
| * | refactor: rename the move to position methods to move to target to be ↵ | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -1/+1 |
| | | | | | | | | consistent with terminology used by scene object part and elsewhere |