Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-04-30 | 3 | -6/+79 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests | Justin Clark-Casey (justincc) | 2013-04-29 | 2 | -5/+64 |
| | | |||||
| * | Add regression test for inventory item give, reject and subsequent trash ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -1/+3 |
| | | | | | | | | | | | | folder purge by receiver. This commit also actually adds the InventoryTransferModuleTests file which I previously forgot | ||||
| * | Add regression test for offer, accept and subsequent receiver delete of an ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -0/+12 |
| | | | | | | | | item offered via instant message. | ||||
| * | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 1 | -2/+2 |
| | | |||||
* | | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 3 | -31/+126 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
| * | Add file missing from last commit 36651be | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -0/+91 |
| | | |||||
| * | On the later forms of teleport failure, tell the user if this was because ↵ | Justin Clark-Casey (justincc) | 2013-03-20 | 2 | -31/+35 |
| | | | | | | | | | | | | | | viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion. Also adds regression test for the case where the viewer couldn't connect with the destination region. Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 1 | -0/+5 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -0/+5 |
| | | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 2 | -0/+182 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| * | Add code for testing event queue messages recevied on region cross. | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -0/+178 |
| | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present. | ||||
| * | Add regression test for presence crossing between regions on the same simulator. | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -0/+4 |
| | | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 4 | -19/+67 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| * | Add regression tests for llGetNotecardLine() | Justin Clark-Casey (justincc) | 2013-02-28 | 4 | -19/+67 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 2 | -6/+53 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| * | minor: remove warning in ConfigurationLoaderTest | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -0/+2 |
| | | |||||
| * | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -6/+51 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-16 | 1 | -20/+89 |
|\ \ | |/ | |||||
| * | Add regression test TestSaveNonRootFolderToIar | Justin Clark-Casey (justincc) | 2013-02-16 | 1 | -20/+89 |
| | | |||||
| * | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 2 | -3/+2 |
|\ \ | |/ | |||||
| * | Remove long unused Scene.DumpAssetsToFile boolean. | Justin Clark-Casey (justincc) | 2013-02-06 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 1 | -0/+214 |
|\ \ | |/ | |||||
| * | Add basic JsonCreateStore() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+214 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | Cached Bakes. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 6 | -30/+81 |
|\ \ \ | |/ / |/| / | |/ | | | | | 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-24 | 4 | -4/+5 |
| | | | | | | | | 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-24 | 2 | -26/+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 careminster | Melanie | 2012-11-20 | 1 | -0/+6 |
|\ \ | |||||
| * | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 1 | -0/+6 |
| | | | | | | | | | | | | * Last step is to flip the throttle distribution. | ||||
| * | | Revert "Merge master into teravuswork", it should have been avination, not ↵ | teravus | 2012-11-15 | 9 | -283/+21 |
| | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64. | ||||
| * | | Merge master into teravuswork | teravus | 2012-11-15 | 9 | -21/+283 |
| |\ \ | |||||
* | \ \ | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 1 | -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 careminster | Melanie | 2012-11-13 | 1 | -0/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules() | Justin Clark-Casey (justincc) | 2012-11-13 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 2 | -27/+9 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 it | Melanie | 2012-11-12 | 2 | -4/+4 |
| | | | | |||||
| * | | | Remove IRegionModule support from the test setup helper | Melanie | 2012-11-12 | 1 | -23/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 1 | -5/+5 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Fix issues with the DynamicTextureModule and corresponding unit tests. | Diva Canto | 2012-11-11 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 1 | -9/+9 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | 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: GodsModule. | Diva Canto | 2012-11-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fix Unit tests -- the module contract was not being honored in the set up of ↵ | Diva Canto | 2012-11-10 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | scenes. | ||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | |