aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Implement get version RemoteAdmin callMelanie2013-01-231-0/+16
| |
* | Add admin_refresh_search command to RemoteAdminMelanie2013-01-161-0/+29
| |
* | Merge branch 'master' into careminsterMelanie2012-11-171-4/+0
|\ \ | |/
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-4/+0
| | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
* | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ | |/
| * Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵Diva Canto2012-11-131-0/+33
| | | | | | | | which had been forgotten.)
* | Merge branch 'master' into careminsterMelanie2012-09-291-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Get rid of some unnecessary casts in RemoteAdminPlugin.Justin Clark-Casey (justincc)2012-09-291-5/+5
| | | | | | | | | | This was stopping http://code.google.com/p/opensimtools/wiki/RemoteAdminPHPClass from working with some methods (e.g. create_user). However, this casting has been around for at least 2 years so I'm puzzled that it worked in the first place, though it probably is extremely old sample code.
* | Merge branch 'master' into careminsterMelanie2012-09-241-74/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove deprecated parameters for region_id.Michelle Argus2012-09-221-74/+0
| | | | | | | | Remove deprecated parameters for region_id as anounced in january 2012.
* | Merge branch 'master' into careminsterMelanie2012-09-161-0/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * Support multi-region OAR filesOren Hurvitz2012-09-141-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 toMelanie2012-06-031-6/+30
| | | | | | | | all affected regions and disregard the region id parameter.
* | If a region is not found on a simulator, make the health query returnMelanie2012-05-281-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 careminsterMelanie2012-02-041-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 Pfeffer2012-02-031-2/+2
| | | | | | | | corresponding RemoteAdmin parameter
* | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-281-1/+19
| | | | | | | | RemoteAdmin message
* | Merge branch 'master' into careminsterMelanie2012-01-061-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-061-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 careminsterMelanie2011-12-191-1/+1
|\ \ | |/
| * addresses mantis #5827nebadon2011-12-191-1/+1
| | | | | | | | | | RAdmin - admin_save_oar fails if noassets parameter missing thanks Michelle Argus
| * Remove a left over log outputMelanie2011-12-081-2/+1
| |
* | Remove spammy log messages when querying sim healthMelanie2011-12-121-8/+0
| |
* | Remove superfluous try blockMelanie2011-12-081-27/+14
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-081-3/+3
|\ \ | |/
| * Remove warning in admin_save_oar xmlrpc method where noassets == true was ↵Justin Clark-Casey (justincc)2011-12-071-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-071-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-071-1711/+1370
| | | | | | | | of code to do password checks, etc., instead of copy/pasting this code into every method
* | Adapt to justincc's remote admin refactorMelanie2011-12-081-1744/+1394
| |
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-0/+113
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-071-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 bigmergeMelanie2011-10-251-21/+41
|\ \ | |/
| * RemoteAdmin - Added optional terrain loading on region create using ↵Michelle Argus2011-10-211-21/+41
| | | | | | | | parameter heightmap_file to specify the terrain file to be loaded
* | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmergeMelanie2011-10-121-39/+1
|\ \ | |/
| * Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() ↵Justin Clark-Casey (justincc)2011-10-081-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 bigmergeMelanie2011-10-121-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-081-5/+4
| | | | | | | | HashSet
* | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmergeMelanie2011-10-121-124/+116
|\ \ | |/
| * Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.Justin Clark-Casey (justincc)2011-10-081-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/opensimJustin Clark-Casey (justincc)2011-10-041-1/+1
| |\
* | \ Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-041-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 bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | Turn off keepalives when commands are specifiedMic Bowman2011-10-041-1/+1
| |/
* | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmergeMelanie2011-10-111-1/+8
|\ \ | |/
| * Add ability to pass in the permissions option (perm) to save oar via RemoteAdminJustin Clark-Casey (justincc)2011-10-011-1/+8
| | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=5686 Thanks Michelle Argus!