ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-15 20:15:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,345 Commits 5 Branches 87 Tags
c19183932e8daae7a178ae034985365c7af2bcb6
Commit Graph

507 Commits

Author SHA1 Message Date
Melanie Thielker
9ce1fd7a3c Merge branch 'avination-current' 2014-08-23 19:39:31 +02:00
Melanie Thielker
1fc5dadc60 Add an admin message to refesh a region's map tile. Will be used to periodically 
rebuild the world map to clean out unused tiles.
 2014-08-23 19:38:08 +02:00
UbitUmarov
01780d4dc6 put back a check for null foldedperms 2014-08-05 19:59:21 +01:00
Melanie
4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Oren Hurvitz
91fd9c4670 Refactored: use a single function to apply an object's folded permissions to its main permissions 2014-01-10 19:50:03 +00:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Eva Comaroski
c896b4179e Added admin_authenticate_user command 2013-11-20 00:09:32 +00:00
Justin Clark-Casey (justincc)
5cef8bf64e Make admin_save_oar request submit a request ID and log this for tracking. 
Previous behaviour of always logging 'name' is unhelpful since this actually an error message parameter which is only filled out if an error has occurred
 2013-11-08 00:31:26 +00:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
44580e2233 Update an AssmblyVersion property that I missed to 0.8.0 2013-10-04 23:36:28 +01:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00
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
5b950ca36a Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster 2013-03-19 00:54:23 +00:00
Justin Clark-Casey (justincc)
03075359b5 Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years. 2013-03-15 23:48:40 +00:00
Melanie
81552f41c6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-05 23:57:53 +00:00
Justin Clark-Casey (justincc)
c91753c065 minor: Log number of region modules loaded from each plugin 2013-03-02 00:56:53 +00:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
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
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
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.
 2013-02-05 00:23:17 +00: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
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
790b595aa0 Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.) 2012-11-13 19:50:19 -08:00
Diva Canto
e4cb7af98a Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file. 2012-11-13 19:26:43 -08:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/ModuleLoader.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2012-11-12 23:27:47 +00:00
Melanie
8c130bcaf5 Remove the old style module loader and all references to it 2012-11-12 22:50:28 +00:00
Melanie
0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid 
grepping for remaining uses
 2012-11-12 19:18:20 +00:00
Melanie
d9b149b375 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-11-12 15:46:45 +00:00
Diva Canto
571f6a0300 One more module converted: XMLRPCModule. Removed it from the special loading at start. 2012-11-11 15:29:25 -08:00
Diva Canto
9f45198516 One more module: DynamicTextureModule. Removed it from the special load in the beginning. 2012-11-11 14:54:40 -08:00
Diva Canto
6759ed1013 One more module converted: LoadImageURLModule. Also removed it from its hard-coded instantiation (I think I understood what the problem was, and that I've done it right). 2012-11-11 14:46:22 -08: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