Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 3 | -33/+110 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | Add JsonTestStore to determine if a JsonStore is associated with | Mic Bowman | 2013-01-30 | 2 | -0/+24 |
| | | | | | | | | a particular UUID. | ||||
| * | Add JsonDestroyStore() basic regression test | Justin Clark-Casey (justincc) | 2013-01-30 | 1 | -0/+15 |
| | | |||||
| * | refactor: Make invocations of json store functions from the regression test ↵ | Justin Clark-Casey (justincc) | 2013-01-30 | 1 | -42/+17 |
| | | | | | | | | simpler | ||||
| * | Add regression test for script func JsonRemoveValue() | Justin Clark-Casey (justincc) | 2013-01-30 | 1 | -0/+52 |
| | | |||||
| * | minor: change name of json script tests to JsonStoreScriptModuleTests ↵ | Justin Clark-Casey (justincc) | 2013-01-29 | 1 | -1/+1 |
| | | | | | | | | instead of copy/pasted LSL_ApiInventoryTests | ||||
| * | Try ignoring json tests if they can't be run due to being on <=.net 3.5 | Justin Clark-Casey (justincc) | 2013-01-29 | 1 | -6/+17 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 4 | -27/+174 |
|\ \ | |/ | |||||
| * | minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to ↵ | Justin Clark-Casey (justincc) | 2013-01-26 | 1 | -0/+2 |
| | | | | | | | | disable any enabled logging from previous tests | ||||
| * | Disable json tests for now - I see this is failing on jenkins because mono ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 2 | -32/+29 |
| | | | | | | | | | | | | 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does. Standardize logging in JsonStoreScriptModule and some minor code formatting. | ||||
| * | See if getting the registering JsonReadNotecard with MethodInfo works around ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -2/+5 |
| | | | | | | | | an apparent issue with registering methods with more than 5 parameters on mono 2.4.3 | ||||
| * | Increase logging by enabling during test setup rather than during individual ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -4/+6 |
| | | | | | | | | tests of for JsonStore | ||||
| * | Enable logging in new json store tests to find out why they fail on jenkins ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -4/+4 |
| | | | | | | | | but not locally. | ||||
| * | Add JsonTestPath() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+17 |
| | | |||||
| * | Add regression test for JsonSetValue() | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+23 |
| | | |||||
| * | minor: remove mono compiler warning in SceneCommandsModule | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -1/+1 |
| | | |||||
| * | Add basic JsonGetValue() regression test. | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+17 |
| | | |||||
| * | Add basic JsonCreateStore() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -0/+86 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 4 | -273/+305 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs | ||||
| * | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in ↵ | PixelTomsen | 2013-01-19 | 4 | -273/+305 |
| | | | | | | | | | | | | | | | | OpenSimDefaults.ini / section [IRC] http://opensimulator.org/mantis/view.php?id=6470 idea: https://github.com/ssm2017/IrcBridgeAlert | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-19 | 2 | -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-19 | 1 | -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-18 | 2 | -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 careminster | Melanie | 2013-01-11 | 2 | -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-11 | 1 | -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 options | Justin Clark-Casey (justincc) | 2013-01-10 | 1 | -2/+43 |
| | | |||||
| * | Move scene debug commands into separate module. Command changes from "debug ↵ | Justin Clark-Casey (justincc) | 2013-01-10 | 1 | -0/+236 |
| | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings | ||||
| * | minor: Capitalize GroupsModule command category | Justin Clark-Casey (justincc) | 2013-01-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 2 | -2/+2 |
|\ \ | |||||
| * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 2 | -2/+2 |
| | | | | | | | | | | | | Cached Bakes. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 3 | -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 ↵ | SignpostMarv | 2013-01-03 | 1 | -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-02 | 1 | -1/+1 |
| | | | | | | | | | | | | console command | ||||
| * | | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable ↵ | Justin Clark-Casey (justincc) | 2013-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | rather than having to ToString() them first | ||||
| * | | Add "show animations" console command for debug purposes. | Justin Clark-Casey (justincc) | 2013-01-02 | 2 | -0/+216 |
| | | | | | | | | | | | | This shows the current animation sequence and default anims for avatars. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-02 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Comment out test messages that go directly to the console. | Robert Adams | 2012-12-31 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 2 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | since at least for now seems good enought | ||||
| * | | Add a transaction ID to the money module path for llTransferLindenDollars | Melanie | 2012-12-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-04 | 2 | -19/+69 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | ||||
| * | | XmlRpcGridRouter | BlueWall | 2012-12-03 | 2 | -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 careminster | Melanie | 2012-11-25 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove a superfluous newline from help | Melanie | 2012-11-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 4 | -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-24 | 2 | -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-24 | 2 | -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 careminster | Melanie | 2012-11-20 | 2 | -0/+11 |
|\ \ | |||||
| * \ | Merge branch 'teravuswork' into avination | Melanie | 2012-11-20 | 2 | -0/+11 |
| |\ \ | |||||
| | * | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution. |