aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2061-155/+58
|\
| * Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-194-96/+3
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1955-55/+53
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-194-17/+28
| |\
| * | Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed Assembly...Diva Canto2013-02-192-4/+2
* | | Correct mistake in parsing 'show object pos' and similar pos commands where t...Justin Clark-Casey (justincc)2013-02-202-9/+9
| |/ |/|
* | Give the user some feedback about the success or failure of console login pro...Justin Clark-Casey (justincc)2013-02-201-2/+13
* | minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linde...Justin Clark-Casey (justincc)2013-02-202-5/+5
* | Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
|/
* First commit of Diva Groups. The Data bits went to OpenSim.Data core, the res...Diva Canto2013-02-1920-0/+9455
* Offline IM: moved the Data and MySQL bits to the corresponding places in core...Diva Canto2013-02-193-8/+2
* One more sql statement on migration #2 for offline im, to really clean up thi...Diva Canto2013-02-181-0/+1
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-181-1/+1
|\
| * minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArray...Justin Clark-Casey (justincc)2013-02-181-1/+1
* | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dllDiva Canto2013-02-189-0/+1016
* | 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
* BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-175-47/+338
* BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
* * 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
* Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
* 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
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-162-22/+22
|\
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-1427-242/+983
| |\
| * | Use SortedDictionary in StatsManager instead of regular Dictionary so stats w...Dan Lake2013-02-142-22/+22
* | | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-1611-54/+277
| |/ |/|
* | Enable one sub-test in TestJsonSetValue() which now works (using identifier w...Justin Clark-Casey (justincc)2013-02-151-17/+13
* | Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJ...Justin Clark-Casey (justincc)2013-02-152-15/+15
* | Comment out regression TestJsonTestPath and TestJsonTestPathJson as these wil...Justin Clark-Casey (justincc)2013-02-151-62/+62
* | 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
| * | * gracefully handle a Situation where a double close is called on the WebSock...teravus2013-02-141-0/+2
* | | 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 JsonA...Justin Clark-Casey (justincc)2013-02-143-8/+8
* | Make new JsonStore script constants separated with underscores, to be consist...Justin Clark-Casey (justincc)2013-02-141-5/+5
* | Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
* | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
* | Fix a very unlikely-to-occur NullReferenceException race condition in llPushO...Justin Clark-Casey (justincc)2013-02-141-2/+7
* | Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-134-1/+162
* | Make path parsing more robust in the JsonStore.Mic Bowman2013-02-121-12/+6
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1310-156/+522
|\ \
| * | Add more sub-tests to TestJsonSetValue for paths containing []{} without {} d...Justin Clark-Casey (justincc)2013-02-131-5/+86
| * | Extend JsonTestSetValue() with tests for escaping brackets, periods and unbal...Justin Clark-Casey (justincc)2013-02-131-2/+71
| * | Add test for array as root element in TestJsonCreateStore()Justin Clark-Casey (justincc)2013-02-131-0/+9
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-139-141/+304
| |\ \