aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2013-03-221-10/+7
|\ \ | |/
| * Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 2...Justin Clark-Casey (justincc)2013-03-201-10/+7
| * Merge branch 'master' into newmultiattachMelanie2013-03-185-49/+156
| |\
| * | Multiattach, part 1Melanie2013-03-181-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-151-15/+26
|\ \ \ | | |/ | |/|
| * | Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-151-15/+26
* | | Merge branch 'master' into careminsterMelanie2013-03-084-34/+130
|\ \ \ | |/ /
| * | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-054-34/+130
| |/
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| * | Revert "Output some additional data on Vivox connection errors", this logs pa...Melanie2013-02-241-1/+1
| * | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-052-7/+8
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-021-6/+7
| |\ \
| | * | minor: Quieten down the parts of the WebSocketEcho module logging for now whe...Justin Clark-Casey (justincc)2013-03-021-6/+7
| * | | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-03-013-4/+7
|\ \ \ | |/ /
| * | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-011-2/+3
| * | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
* | | Merge branch 'master' into careminsterMelanie2013-02-282-0/+10
|\ \ \ | |/ /
| * | Add comment to example region modules about need to add Assembly annotation i...Justin Clark-Casey (justincc)2013-02-272-0/+10
* | | Merge branch 'master' into careminsterMelanie2013-02-273-32/+47
|\ \ \ | |/ /
| * | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-273-32/+47
* | | Merge branch 'master' into careminsterMelanie2013-02-261-0/+328
|\ \ \ | |/ /
| * | Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| * | Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
* | | Merge branch 'master' into careminsterMelanie2013-02-226-108/+16
|\ \ \ | |/ /
| * | minor: Change summary in "show appearance" console command to "incomplete" ra...Justin Clark-Casey (justincc)2013-02-211-1/+1
| * | Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-193-95/+3
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| * | Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
| * | minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArray...Justin Clark-Casey (justincc)2013-02-181-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-153-69/+170
|\ \ \ | |/ /
| * | 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
| * | 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
| * | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonA...Justin Clark-Casey (justincc)2013-02-142-6/+6
| * | Make new JsonStore script constants separated with underscores, to be consist...Justin Clark-Casey (justincc)2013-02-141-5/+5
* | | Merge branch 'master' into careminsterMelanie2013-02-143-13/+153
|\ \ \ | |/ /
| * | Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-133-1/+147
| * | Make path parsing more robust in the JsonStore.Mic Bowman2013-02-121-12/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-131-15/+218
|\ \ \ | |/ /
| * | 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
| * | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
* | | Merge branch 'master' into careminsterMelanie2013-02-123-40/+259
|\ \ \ | |/ /