aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins (follow)
Commit message (Collapse)AuthorAgeFilesLines
* put back a check for null foldedpermsUbitUmarov2014-08-051-1/+1
|
* Merge branch 'master' into careminsterMelanie2014-01-281-7/+5
|\ | | | | | | | | | | | | | | 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
| * Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-101-7/+5
| | | | | | | | its main permissions
* | Merge branch 'master' into careminsterMelanie2013-11-231-4/+150
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Added admin_authenticate_user commandEva Comaroski2013-11-201-0/+136
| |
| * Make admin_save_oar request submit a request ID and log this for tracking.Justin Clark-Casey (justincc)2013-11-081-4/+14
| | | | | | | | 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
* | Merge branch 'master' into careminsterMelanie2013-10-063-3/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Update an AssmblyVersion property that I missed to 0.8.0Justin Clark-Casey (justincc)2013-10-041-1/+1
| |
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-042-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-08-171-15/+30
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * Fix issues with RemoteAdmin admin_save_heightmap and admin_load_heightmap ↵Justin Clark-Casey (justincc)2013-08-171-15/+30
| | | | | | | | | | | | | | | | | | 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!
* | Merge branch 'master' into careminsterMelanie2013-05-111-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * minor: Remove mono compiler warning in RemoteAdminPluginJustin Clark-Casey (justincc)2013-05-091-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-05-061-0/+17
|\ \ | |/
| * Added new method to Remote Admin for reloading the estate settings. This is ↵Diva Canto2013-05-061-0/+17
| | | | | | | | meant to be called when some other program has changed the data on the backend.
* | Merge branch 'master' into careminsterMelanie2013-05-042-8/+16
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-032-8/+16
| | | | | | | | | | | | | | 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
* | Merge branch 'master' into careminsterMelanie2013-04-041-1/+1
|\ \ | |/
| * Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last ↵Justin Clark-Casey (justincc)2013-04-041-1/+1
| | | | | | | | | | | | user login time rather than serializing the DateTime directly which generates a set of unexpected fields. lastlogin return is in unix timestamp format.
* | Merge branch 'master' into careminsterMelanie2013-03-271-0/+66
|\ \ | |/
| * Add admin_get_agents xmlrpc method.Justin Clark-Casey (justincc)2013-03-261-0/+66
| | | | | | | | | | | | 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
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
| | | | | | | | 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"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| | | | | | | | 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"
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-1922-8775/+0
|\ \ | |/
| * Finally remove the 'REST' ApplicationPlugins code which has been ↵Justin Clark-Casey (justincc)2013-03-1522-8775/+0
| | | | | | | | non-functional and largely commented out for many years.
* | Merge branch 'master' into careminsterMelanie2013-03-051-1/+23
|\ \ | |/ | | | | | | | | | | | | 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
| * minor: Log number of region modules loaded from each pluginJustin Clark-Casey (justincc)2013-03-021-1/+23
| |
* | Merge branch 'master' into careminsterMelanie2013-02-223-3/+2
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-193-3/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-053-4/+4
|\ \ | |/ | | | | | | | | | | | | 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-053-4/+4
| | | | | | | | | | | | | | | | 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-153-2/+68
|\ \ | |/
| * Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵Diva Canto2012-11-132-0/+66
| | | | | | | | which had been forgotten.)
| * Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-131-2/+2
| | | | | | | | have an AssemblyInfo file.
* | Merge branch 'master' into careminsterMelanie2012-11-122-4/+1
|\ \ | |/ | | | | | | | | | | | | | | 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
| * Remove the old style module loader and all references to itMelanie2012-11-121-3/+0
| |
| * Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-1/+1
| | | | | | | | grepping for remaining uses
* | Merge branch 'master' into careminsterMelanie2012-11-121-6/+6
|\ \ | |/ | | | | | | | | | | | | 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
| * One more module converted: XMLRPCModule. Removed it from the special loading ↵Diva Canto2012-11-111-2/+2
| | | | | | | | at start.
| * One more module: DynamicTextureModule. Removed it from the special load in ↵Diva Canto2012-11-111-2/+2
| | | | | | | | the beginning.
| * One more module converted: LoadImageURLModule. Also removed it from its ↵Diva Canto2012-11-111-2/+2
| | | | | | | | hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
* | 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-243-93/+25
|\ \ | |/ | | | | | | 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.
| * Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-212-19/+25
| | | | | | | | | | | | As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead. So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway. If this facility is actually being used then please notify me or uncomment it if you are core.
generated by cgit v1.1 at 2024-12-21 08:30:49 +0000