| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Add testing for getting non-existing values and values from a non-existing ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+10 | |
| | | | | | | | | | | | | | datastore to TestJsonGetValue() | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -15/+29 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add TestJsonDestoreStoreNotExists() | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 5 | -15/+249 | |
| | |\ \ | ||||||
| | | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 2 | -0/+10 | |
| | | | | | ||||||
| | * | | | Fix a recent regression in e17392a where JsonSetValue() stopped working ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 2 | -14/+179 | |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll | |||||
| | * | | | Change passed PhysicsParameter value from float to the more general string value | Robert Adams | 2013-02-07 | 1 | -14/+5 | |
| | | | | | ||||||
| | * | | | Websocket Echo module should not be on by default. | teravus | 2013-02-07 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | * missing example module.. Oops. | teravus | 2013-02-07 | 1 | -0/+174 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -1/+60 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-07 | 3 | -13/+95 | |
| | |\ \ \ | | |/ / | ||||||
| | * | | | Add TestJsonWriteReadNotecard() regression test | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -1/+44 | |
| | | | | | ||||||
| | * | | | Make json store tests operate on a single thread to ensure we don't run into ↵ | Justin Clark-Casey (justincc) | 2013-02-07 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | | any race related test failures in the future. | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -13/+95 | |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||||
| | * | | | Enables script access to the per object dynamic attributes through the JsonStore | Mic Bowman | 2013-02-06 | 3 | -13/+95 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -8/+18 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||||
| | * | | Allow JsonReadNotecard() to accept the name of the notecard as well as the ↵ | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -8/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | asset ID. Agreed in discussion with cmickeyb. This is to make this consistent with similar existing LSL/OSSL functions such as llTriggerSound() and osNpcLoadAppearance() that allow an item name or an asset id. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 2 | -87/+190 | |
| |\ \ \ | |/ / | ||||||
| | * | | Move the JsonStore regular expressions to static variables to avoid | Mic Bowman | 2013-01-31 | 2 | -87/+190 | |
| | | | | | | | | | | | | | | | | recompiling on every operation. Added JsonList2Path script function to simplify array iteration. | |||||
| * | | | 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 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |