aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | minor: remove some mono compiler warnings in ↵Justin Clark-Casey (justincc)2013-02-202-5/+5
| | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll
| * | Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
| |/
| * This should fix the build fail. Fingers crossed.Diva Canto2013-02-191-1/+1
| |
| * Previous build failed. Checking in a dummy change to see if the fail persists.Diva Canto2013-02-191-3/+3
| |
| * First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-1924-15/+9544
| | | | | | | | rest to Addons.Groups.dll.
| * Offline IM: moved the Data and MySQL bits to the corresponding places in ↵Diva Canto2013-02-196-13/+5
| | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
| * One more sql statement on migration #2 for offline im, to really clean up ↵Diva Canto2013-02-181-0/+1
| | | | | | | | things.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-181-1/+1
| |\
| | * minor: Rename regression test method TestGetArrayLength() -> ↵Justin Clark-Casey (justincc)2013-02-181-1/+1
| | | | | | | | | | | | JsonTestGetArrayLength() to match others
| * | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dllDiva Canto2013-02-1813-15/+1088
| | |
| * | I need these for OfflineIM and Groups.Diva Canto2013-02-181-0/+60
| |/
| * BulletSim: experimental lock axis code using constraints. Not enabledRobert Adams2013-02-172-22/+74
| | | | | | | | by default. Like more debugging is needed.
| * BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-179-47/+338
| | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet.
| * BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
| | | | | | | | (like vectors or quaternions).
| * * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
| |
| * BulletSim: fix physical object appearing to slowly float off whenRobert Adams2013-02-161-1/+1
| | | | | | | | they stop moving.
| * Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2013-02-1612-298/+533
|\ \ | |/
| * Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
| |
| * Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | | | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-162-22/+22
| |\
| * | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-1611-54/+277
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-1513-103/+267
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-1432-242/+983
| |\ \ | | |/
| | * Enable one sub-test in TestJsonSetValue() which now works (using identifier ↵Justin Clark-Casey (justincc)2013-02-151-17/+13
| | | | | | | | | | | | | | | | | | | | | with embedded .). Need to look further at other still commented tests. Still need to check coverage against some of Mic's scripts.
| | * Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> ↵Justin Clark-Casey (justincc)2013-02-152-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | JsonGetJson() This is because JsonGetJson() is getting json from anywhere in the structure, not just values. Equally, JsonSetJson() is setting any type of json, not just json which represents a value. Agreed with cmickeyb
| | * Comment out regression TestJsonTestPath and TestJsonTestPathJson as these ↵Justin Clark-Casey (justincc)2013-02-151-62/+62
| | | | | | | | | | | | will go away soon
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-153-7/+11
| | |\
| | | * * Handle null check on configs in module startup so that the the code can be ↵teravus2013-02-142-7/+9
| | | | | | | | | | | | | | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
| | | * * gracefully handle a Situation where a double close is called on the ↵teravus2013-02-141-0/+2
| | | | | | | | | | | | | | | | WebSocket handler
| | * | Add regression TestJsonList2Path()Justin Clark-Casey (justincc)2013-02-151-2/+27
| | |/
| | * Add regression TestGetArrayLength()Justin Clark-Casey (justincc)2013-02-141-0/+33
| | |
| | * Add regression TestJsonGetPathType()Justin Clark-Casey (justincc)2013-02-141-0/+47
| | |
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-142-2/+2
| | |
| | * Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-143-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
| | * Make new JsonStore script constants separated with underscores, to be ↵Justin Clark-Casey (justincc)2013-02-141-5/+5
| | | | | | | | | | | | | | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb
| | * Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart.
| * | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵Dan Lake2013-02-142-22/+22
| | | | | | | | | | | | will interate and print in a defined order
* | | Merge branch 'master' into careminsterMelanie2013-02-140-0/+0
|\ \ \ | | |/ | |/|
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-142-5/+26
|\ \ \
| * | | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2013-02-142-20/+77
|\ \ \ \ | |/ / /
| * | | Small fix to sim features moduleMelanie2013-02-141-0/+2
| | | |
| * | | Revert "Make keyframes use the sim's frame timer"Melanie2013-02-121-8/+15
| | | | | | | | | | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f.
| * | | Revert "Push updates from keyframe directly to the front of the output queue ↵Melanie2013-02-125-46/+10
| | | | | | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
| * | | Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
| | | | | | | | | | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010.
| * | | Use actual time dilation for unqueued updatesMelanie2013-02-121-1/+1
| | | |
| * | | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-125-10/+46
| | | | | | | | | | | | | | | | than through the update system.
| * | | Make keyframes use the sim's frame timerMelanie2013-02-111-15/+8
| | | |