aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-223-31/+126
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Add file missing from last commit 36651beJustin Clark-Casey (justincc)2013-03-201-0/+91
| |
| * On the later forms of teleport failure, tell the user if this was because ↵Justin Clark-Casey (justincc)2013-03-202-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 careminsterMelanie2013-03-151-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-141-0/+5
| | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
* | Merge branch 'master' into careminsterMelanie2013-03-082-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-061-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-061-0/+4
| | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode.
* | Merge branch 'master' into careminsterMelanie2013-02-284-19/+67
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-284-19/+67
| |
* | Merge branch 'master' into careminsterMelanie2013-02-272-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 ConfigurationLoaderTestJustin Clark-Casey (justincc)2013-02-261-0/+2
| |
| * Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-6/+51
| |
* | Merge branch 'master' into careminsterMelanie2013-02-161-20/+89
|\ \ | |/
| * Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-161-20/+89
| |
| * Plumb the path from the client to the extra physics params and backMelanie2013-02-071-0/+5
| |
* | Merge branch 'master' into careminsterMelanie2013-02-071-1/+1
|\ \ | |/
| * Add TestJsonWriteReadNotecard() regression testJustin Clark-Casey (justincc)2013-02-071-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-062-3/+2
|\ \ | |/
| * Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-062-3/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-01-261-0/+214
|\ \ | |/
| * Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-251-0/+214
| |
* | 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 careminsterMelanie2012-11-256-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-244-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-242-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 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-159-283/+21
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-159-21/+283
| |\ \
* | \ \ 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-131-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()Justin Clark-Casey (justincc)2012-11-131-0/+4
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-122-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 itMelanie2012-11-122-4/+4
| | | |
| * | | Remove IRegionModule support from the test setup helperMelanie2012-11-121-23/+5
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-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 Canto2012-11-111-5/+5
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-111-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 Canto2012-11-101-3/+3
| | | |
| * | | Fix Unit tests -- the module contract was not being honored in the set up of ↵Diva Canto2012-11-101-6/+6
| | | | | | | | | | | | | | | | scenes.
* | | | Merge branch 'master' into careminsterMelanie2012-11-091-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Update parent inventory folder version numbers when folders are ↵Justin Clark-Casey (justincc)2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | moved/created/deleted to match version numbers cached by viewers. This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders). This should hopefully improve viewer reuse of its cached inventory information. Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
* | | Merge branch 'master' into careminsterMelanie2012-10-261-7/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-7/+3
| | | | | | | | | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-0/+4
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* | | Merge branch 'master' into careminsterMelanie2012-08-314-9/+141
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs