aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-061-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-061-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 careminsterMelanie2013-02-051-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.6Justin Clark-Casey (justincc)2013-02-051-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 careminsterMelanie2013-02-042-87/+190
|\ \ | |/
| * Move the JsonStore regular expressions to static variables to avoidMic Bowman2013-01-312-87/+190
| | | | | | | | | | recompiling on every operation. Added JsonList2Path script function to simplify array iteration.
* | Merge branch 'master' into careminsterMelanie2013-01-313-33/+110
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-302-0/+24
| | | | | | | | a particular UUID.
| * Add JsonDestroyStore() basic regression testJustin Clark-Casey (justincc)2013-01-301-0/+15
| |
| * refactor: Make invocations of json store functions from the regression test ↵Justin Clark-Casey (justincc)2013-01-301-42/+17
| | | | | | | | simpler
| * Add regression test for script func JsonRemoveValue()Justin Clark-Casey (justincc)2013-01-301-0/+52
| |
| * minor: change name of json script tests to JsonStoreScriptModuleTests ↵Justin Clark-Casey (justincc)2013-01-291-1/+1
| | | | | | | | instead of copy/pasted LSL_ApiInventoryTests
| * Try ignoring json tests if they can't be run due to being on <=.net 3.5Justin Clark-Casey (justincc)2013-01-291-6/+17
| |
* | Merge branch 'master' into careminsterMelanie2013-01-264-27/+174
|\ \ | |/
| * minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to ↵Justin Clark-Casey (justincc)2013-01-261-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-252-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-251-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-251-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-251-4/+4
| | | | | | | | but not locally.
| * Add JsonTestPath() regression testJustin Clark-Casey (justincc)2013-01-251-0/+17
| |
| * Add regression test for JsonSetValue()Justin Clark-Casey (justincc)2013-01-251-0/+23
| |
| * minor: remove mono compiler warning in SceneCommandsModuleJustin Clark-Casey (justincc)2013-01-251-1/+1
| |
| * Add basic JsonGetValue() regression test.Justin Clark-Casey (justincc)2013-01-251-0/+17
| |
| * Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-251-0/+86
| |
* | Merge branch 'master' into careminsterMelanie2013-01-234-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 ↵PixelTomsen2013-01-194-273/+305
| | | | | | | | | | | | | | | | OpenSimDefaults.ini / section [IRC] http://opensimulator.org/mantis/view.php?id=6470 idea: https://github.com/ssm2017/IrcBridgeAlert
* | 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
| | |
generated by cgit v1.1 at 2024-12-22 13:24:45 +0000