aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | Merge branch 'master' into careminsterMelanie2013-04-291-1/+1
|\ \ | |/
| * Unbreak the sample money moduleMelanie2013-04-271-0/+2
| |
| * Small oversight in EconomyDataRequest - this would have affected everyone ↵Melanie2013-04-271-2/+0
| | | | | | | | NOT using a money module.
* | Merge branch 'master' into careminsterMelanie2013-04-251-11/+6
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-11/+6
| | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
| |
* | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-03-231-0/+31
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+31
| | | | | | | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
| * Plumb the path from the client to the extra physics params and backMelanie2013-02-071-0/+5
| |
* | Merge branch 'master' into careminsterMelanie2013-01-262-1/+3
|\ \ | |/
| * minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to ↵Justin Clark-Casey (justincc)2013-01-261-0/+2
| | | | | | | | disable any enabled logging from previous tests
| * minor: remove mono compiler warning in SceneCommandsModuleJustin Clark-Casey (justincc)2013-01-251-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-01-191-15/+23
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * Fix use of scene debug commands when region is set to root or a specific ↵Justin Clark-Casey (justincc)2013-01-191-15/+12
| | | | | | | | region where there is more than one region on the simulator.
| * Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-181-0/+11
| | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
* | Merge branch 'master' into careminsterMelanie2013-01-111-0/+227
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Fix a regression in the last few scene commands changes where setting these ↵Justin Clark-Casey (justincc)2013-01-111-52/+2
| | | | | | | | | | | | | | via the viewer estate dialog stopped working. Forgot to register the new interface. Also removes some code which got included by adpating an existing module.
| * Add "debug scene get" console command to list current scene optionsJustin Clark-Casey (justincc)2013-01-101-2/+43
| |
| * Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-0/+236
| | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* | Merge branch 'avination' into careminsterMelanie2013-01-061-1/+1
|\ \
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+1
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2013-01-041-6/+8
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | updating documentation in SampleMoneyModule based on doxygen error log ↵SignpostMarv2013-01-031-6/+8
| | | | | | | | | | | | output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+1
|\ \ \ | | |/ | |/|
| * | Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-031-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'avination' into careminsterMelanie2012-11-201-0/+6
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+6
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-152-22/+7
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-152-7/+22
| |\ \
* | \ \ Merge branch 'avination' into careminsterMelanie2012-11-171-1/+1
|\ \ \ \ | |/ / /
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-1/+1
| | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
* | | | Merge branch 'master' into careminsterMelanie2012-11-153-0/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | All optional modules' directives moved out of addin.xmlDiva Canto2012-11-133-0/+6
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-132-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-122-2/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-2/+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 any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-2/+1
| | | | | | | | | | | | | | | | grepping for remaining uses
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-46/+78
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | document & 80-character width terminal formattingSignpostMarv2012-11-111-49/+80
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| * | | converting NPC module to ISharedRegionModuleSignpostMarv2012-11-111-9/+22
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | Merge branch 'master' into careminsterMelanie2012-11-111-11/+19
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | One more module converted: TreePopulator.Diva Canto2012-11-091-11/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-301-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2025-01-03 16:09:12 +0000