aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | 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.
* | Merge branch 'master' into careminsterMelanie2012-06-131-1/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| * Don't include time to transmit response back to requester when assessing ↵Justin Clark-Casey (justincc)2012-06-131-1/+0
| | | | | | | | | | | | | | | | | | | | slow handling of requests. This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response. This is not something we can do much about on the server end - it's server-side delay that we're interested in. To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change. IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this. Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
* | Merge branch 'avination' into careminsterMelanie2012-06-061-6/+30
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | 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.
* | | Merge branch 'avination'Melanie2012-05-291-4/+13
|\ \ \ | |/ /
| * | 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-05-101-2/+3
|\ \ \ | |/ / |/| / | |/
| * Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-101-2/+3
| | | | | | | | | | | | | | | | | | | | completely rewritten every time a region starts up. This makes the data write only when the data was not already read from the database. There is a still a major race condition whenever two regions share the same estate data, but at least it won't be triggered on startup.
* | 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 branch 'master' into bigmergeMelanie2011-12-054-15/+15
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-054-15/+15
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/ | | | | | | | | | | | | 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
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-031-1/+1
| | | | | | | | | | | | 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.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmergeMelanie2011-10-251-21/+41
|\ \ | |/
generated by cgit v1.1 at 2024-11-18 22:24:26 +0000