Commit Graph

447 Commits (1d75220fccb511fa2b3e8da118e9a91fac8e1fc3)

Author SHA1 Message Date
Melanie 207a5f17b5 When regions are set to shut down the instance, always send notifications to
all affected regions and disregard the region id parameter.
2012-06-03 13:43:39 +02:00
Melanie ca3b229e94 If a region is not found on a simulator, make the health query return
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,
2012-05-28 09:15:24 +02:00
Melanie ce5e900721 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
Snoopy Pfeffer 83ef13a79a Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter 2012-02-03 23:53:18 +01:00
Melanie 7c824f02b4 Add the ability to abort a pending restart using the viewer UI or a
RemoteAdmin message
2012-01-28 22:19:10 +01:00
Justin Clark-Casey (justincc) 3073370d0e Allow RemoteAdmin to deal with all the different kinds of region id parameter that have been used in different methods.
See http://opensimulator.org/mantis/view.php?id=5814
Thanks Michelle Argus!
2012-01-06 22:29:27 +00:00
Melanie a34278cfc3 Merge branch 'master' into careminster
Conflicts:
	OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2012-01-06 22:41:26 +00:00
Melanie efa4284391 Merge branch 'master' into careminster 2011-12-19 21:30:57 +00:00
nebadon 6baee2e10b addresses mantis #5827
RAdmin - admin_save_oar fails if noassets parameter missing
thanks Michelle Argus
2011-12-19 11:51:03 -07:00
Melanie afab4b276e Remove spammy log messages when querying sim health 2011-12-12 13:51:31 +01:00
Melanie 43732794dd Remove a left over log output 2011-12-08 05:46:59 +00:00
Melanie 1e4842eaba Remove superfluous try block 2011-12-08 05:28:54 +01:00
Melanie ea1f5fb08d Merge branch 'master' into bigmerge 2011-12-08 03:53:30 +00:00
Melanie 603ad905e1 Adapt to justincc's remote admin refactor 2011-12-08 03:53:09 +00:00
Melanie 50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
Justin Clark-Casey (justincc) dae58e0937 Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string 2011-12-07 22:42:05 +00:00
Justin Clark-Casey (justincc) 2b4de8f881 Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return success = true on success rather than false 2011-12-07 22:40:23 +00:00
Justin Clark-Casey (justincc) fb2f4f158c Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block of code to do password checks, etc., instead of copy/pasting this code into every method 2011-12-07 22:39:12 +00:00
Justin Clark-Casey (justincc) 415b7b7ec4 Implement XMLRPCAdmin command admin_teleport_agent.
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
2011-12-07 17:31:57 +00:00
Justin Clark-Casey (justincc) 4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead 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.
2011-12-05 20:44:20 +00:00
Melanie bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie 24235006f4 Merge branch 'master' into bigmerge
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
2011-11-04 01:18:37 +00:00
Dan Lake b8d50b10fb Rename ForEachAvatar back to ForEachScenePresence. The other changes
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.
2011-11-03 17:53:51 -07:00
Dan Lake 94dc7d07eb Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
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.
2011-11-03 17:06:08 -07:00
Melanie 1ae36695ba Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge 2011-10-25 03:18:23 +01:00
Melanie b6881187d0 Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge 2011-10-25 02:56:45 +01:00
Melanie 752b744105 Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge 2011-10-25 02:56:40 +01:00
Michelle Argus a1f05a289d RemoteAdmin - Added optional terrain loading on region create using parameter heightmap_file to specify the terrain file to be loaded 2011-10-21 23:12:01 +01:00
Justin Clark-Casey (justincc) fe484ab331 Slightly change log message in LoadRegionsPlugin 2011-10-19 01:22:07 +01:00
Pixel Tomsen 178b8d0926 Region-UUID - can not be zero-uuid
http://opensimulator.org/mantis/view.php?id=3426
2011-10-19 01:19:21 +01:00
Melanie cc4b1c69d8 Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge 2011-10-12 07:23:02 +01:00
Melanie 3a290e581a Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
Conflicts:
	OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2011-10-12 07:09:41 +01:00
Melanie 2c23fc9e68 Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge 2011-10-12 07:09:04 +01:00
Melanie 6af388ded9 Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge 2011-10-12 01:30:14 +01:00
Melanie 30b2fc6aea Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge 2011-10-12 01:29:47 +01:00
Melanie 95a1a804bf Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge 2011-10-11 23:15:29 +01:00
Melanie ea8350a526 Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge 2011-10-11 23:02:04 +01:00
Melanie 652c59c0a9 Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge 2011-10-11 22:42:18 +01:00
Melanie 673886d231 Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge 2011-10-11 21:30:42 +01:00
Justin Clark-Casey (justincc) 29660fe175 Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() check on XMLRPC RemoteAdmin handlers.
If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway.
2011-10-08 02:00:36 +01:00
Justin Clark-Casey (justincc) 71d29decc8 replace List used by m_accessIP in RemoteAdminPlugin with the more efficient HashSet 2011-10-08 01:53:10 +01:00
Justin Clark-Casey (justincc) 4073cd6ced Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
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.
2011-10-08 01:23:26 +01:00
Justin Clark-Casey (justincc) 9a49b3b519 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-04 23:53:30 +01:00
Justin Clark-Casey (justincc) b907a66f39 When creating a new user on the comand line, give the option of allowing a 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.
2011-10-04 23:48:35 +01:00
Mic Bowman b229a72a5f Turn off keepalives when commands are specified 2011-10-04 15:43:41 -07:00
Justin Clark-Casey (justincc) a1875ec760 Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin
Applies patch in http://opensimulator.org/mantis/view.php?id=5686
Thanks Michelle Argus!
2011-10-01 00:19:09 +01:00
Kevin Houlihan e789ab659c Removed uncalled region load method.
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.
2011-09-24 02:06:34 +01:00
Justin Clark-Casey (justincc) d358125cac Reinstate option to land an npc when it reaches a target.
This is moved into ScenePresence for now as a general facility
2011-09-22 00:16:05 +01:00
Kevin Houlihan 1458fab82c Reattaching a region was failing if the estate name had not changed (issue 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.
2011-09-16 18:50:25 +01:00
Tom 5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00