ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 22:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,371 Commits 5 Branches 93 Tags
bef03fb30be67dbe671dcc330558daf8a6c4bb22
Commit Graph

255 Commits

Author SHA1 Message Date
Melanie
bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
 2013-08-17 03:23:45 +01:00
Justin Clark-Casey (justincc)
14ae89dbe7 Fix issues with RemoteAdmin admin_save_heightmap and admin_load_heightmap not working. 
This is because they were wrongly looking for both regionid and region_id parameters in the same request.
Now only region_id is required (and recognized), regionid having been already deprecated for some time.
This is essentially Michelle Argus' patch from http://opensimulator.org/mantis/view.php?id=6737 but with tabs replaced with spaces.
Thanks!
 2013-08-17 00:39:41 +01:00
Melanie
13cd8c17d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2013-05-11 02:35:26 +01:00
Justin Clark-Casey (justincc)
0e6ad94829 minor: Remove mono compiler warning in RemoteAdminPlugin 2013-05-09 22:44:45 +01:00
Melanie
b36e123c7f Merge branch 'master' into careminster 2013-05-06 23:47:19 +01:00
Diva Canto
90f03ccd42 Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend. 2013-05-06 11:47:55 -07:00
Melanie
3aa83738e2 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-05-04 01:22:12 +01:00
Justin Clark-Casey (justincc)
304c5d4a8b On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created. 
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
 2013-05-03 18:48:50 +01:00
Melanie
6a5f6ac04e Merge branch 'master' into careminster 2013-04-04 03:17:57 +01:00
Justin Clark-Casey (justincc)
f064075a85 Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last user login time rather than serializing the DateTime directly which generates a set of unexpected fields. 
lastlogin return is in unix timestamp format.
 2013-04-04 01:06:57 +01:00
Melanie
e320046683 Merge branch 'master' into careminster 2013-03-27 01:17:59 +00:00
Justin Clark-Casey (justincc)
da5dbaf1d0 Add admin_get_agents xmlrpc method. 
This allows one to retrieve information about agents from a particular region (name, id, position, etc.)
Similar to output from "show users"
See http://opensimulator.org/wiki/Remoteadmin:admin_get_agents for more details
 2013-03-26 23:02:13 +00:00
Melanie
5f4c4df227 Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-26 03:40:06 +00:00
Melanie
c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01:00
Melanie
8c6984eac1 Implement get version RemoteAdmin call 2013-01-23 23:12:48 +01:00
Melanie
451b6c0e82 Add admin_refresh_search command to RemoteAdmin 2013-01-16 14:52:04 +01:00
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
392e84e554 Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid 
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
 2012-11-17 01:23:29 +00:00
Melanie
71dd55a1ce Merge branch 'master' into careminster 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-09-29 19:21:07 +01:00
Justin Clark-Casey (justincc)
4e9509dafa Get rid of some unnecessary casts in RemoteAdminPlugin. 
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.
 2012-09-29 02:57:28 +01:00
Melanie
bbaf2c5a80 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-24 20:14:00 +01:00
Michelle Argus
a6f7328216 Remove deprecated parameters for region_id. 
Remove deprecated parameters for region_id as anounced in january 2012.
 2012-09-22 01:30:38 +01:00
Melanie
db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Oren Hurvitz
ce468215d5 Support multi-region OAR files 
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.
 2012-09-14 20:25:03 +01:00
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
Melanie
1ae36695ba Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge 2011-10-25 03:18:23 +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
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