aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-255-218/+628
| |\ \
| | * | Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
| | * | Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| | * | Make StatsManager default output a little more readableRobert Adams2013-02-241-1/+1
| | * | Add EventHistogram.GetHistogramAsOSDMap that returns that parametersRobert Adams2013-02-241-211/+228
| | * | Modify StatsManager so console command "show stats category container"Robert Adams2013-02-241-5/+24
| | * | Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| * | | Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the roles...Diva Canto2013-02-254-3/+16
| |/ /
* | | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-2315-60/+129
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-222-42/+87
| |\ \
| | * | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set...Justin Clark-Casey (justincc)2013-02-221-0/+6
| | * | Make reset of EntityTransferStateMachine for an avatar transfer always happen...Justin Clark-Casey (justincc)2013-02-221-42/+81
| * | | Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-2213-15/+54
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-22132-711/+11859
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-214-3/+236
| |\ \
| | * | Add a virtual ToOSDMap() function to Monitoring.Stat for futureRobert Adams2013-02-211-0/+16
| | * | Add CounterStat which is a wrapper for a counter stat but, becauseRobert Adams2013-02-212-1/+218
| | * | minor: Change summary in "show appearance" console command to "incomplete" ra...Justin Clark-Casey (justincc)2013-02-212-2/+2
| * | | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as de...Diva Canto2013-02-2113-37/+79
| |/ /
| * | BulletSim: add OutOfBounds logic and some position sanity checkingRobert Adams2013-02-215-33/+68
| * | Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-206-4/+82
| * | Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
| * | 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
* | | 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
| * | 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