aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-192-34/+27
|\ | | | | | | | | | | | | 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-182-19/+15
| | | | | | | | | | 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-112-1/+228
|\ \ | |/ | | | | | | 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
| * minor: Capitalize GroupsModule command categoryJustin Clark-Casey (justincc)2013-01-101-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2013-01-062-2/+2
|\ \
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-212-2/+2
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2013-01-043-6/+224
|\ \ \ | | |/ | |/| | | | | | | | | | 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
| * | Fix indenting on ConsoleDisplayTable, align indenting on "show animations" ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | | | | | | | | | console command
| * | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | | | | | | | | | rather than having to ToString() them first
| * | Add "show animations" console command for debug purposes.Justin Clark-Casey (justincc)2013-01-022-0/+216
| | | | | | | | | | | | This shows the current animation sequence and default anims for avatars.
* | | Merge branch 'master' into careminsterMelanie2013-01-021-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Comment out test messages that go directly to the console.Robert Adams2012-12-311-2/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-12-182-2/+2
|\ \ \ | | |/ | |/|
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-1/+1
| | | | | | | | | | | | since at least for now seems good enought
| * | Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-031-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-042-19/+69
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * | XmlRpcGridRouterBlueWall2012-12-032-19/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code.
* | | Merge branch 'avination' into careminsterMelanie2012-11-251-2/+2
|\ \ \ | | |/ | |/|
| * | Remove a superfluous newline from helpMelanie2012-11-231-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-254-68/+78
|\ \ \ | |/ / |/| / | |/ | | | | 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-242-2/+2
| | | | | | | | automatically turns off any logging enabled between tests
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-242-66/+76
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* | Merge branch 'avination' into careminsterMelanie2012-11-202-0/+11
|\ \
| * \ Merge branch 'teravuswork' into avinationMelanie2012-11-202-0/+11
| |\ \
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-172-0/+11
| | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution.
| | * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-1517-167/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| | * | Merge master into teravusworkteravus2012-11-1517-369/+167
| | |\ \
* | | \ \ Merge branch 'avination' into careminsterMelanie2012-11-173-14/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-061-13/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | removed potencial null refs and rearrange code a bitUbitUmarov2012-11-041-13/+19
| | | | |
| * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-042-1/+2
| | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-041-0/+16
| |/ / / | | | | | | | | | | | | script engines to use them.
* | | | Merge branch 'master' into careminsterMelanie2012-11-1511-23/+52
|\ \ \ \ | | |_|/ | |/| |
| * | | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵Diva Canto2012-11-131-0/+37
| | | | | | | | | | | | | | | | which had been forgotten.)
| * | | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.Diva Canto2012-11-132-15/+0
| | | |
| * | | All optional modules' directives moved out of addin.xmlDiva Canto2012-11-139-8/+15
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-136-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 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-126-6/+6
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-128-9/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-128-9/+8
| | | | | | | | | | | | | | | | grepping for remaining uses
* | | | Merge branch 'master' into careminsterMelanie2012-11-125-124/+230
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.Diva Canto2012-11-112-18/+60
| | | |
| * | | One more module converted: MRMModule.Diva Canto2012-11-111-35/+56
| | | |
| * | | One more module converted: IRCStackModule.Diva Canto2012-11-111-19/+35
| | | |
| * | | document & 80-character width terminal formattingSignpostMarv2012-11-111-49/+80
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>