aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-2735-295/+705
| |\ \
| | * | Add comment to example region modules about need to add Assembly annotation i...Justin Clark-Casey (justincc)2013-02-272-0/+10
| | * | Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-273-18/+13
| | * | Get "show modules" console command to show modules in alphabetical order, and...Justin Clark-Casey (justincc)2013-02-271-7/+20
| | * | Add asset name and description truncation warnings to SQLite database plugin ...Justin Clark-Casey (justincc)2013-02-271-5/+23
| | * | Add more information to warnings logged when asset names and descriptions hav...Justin Clark-Casey (justincc)2013-02-273-6/+18
| * | | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-2712-14/+14
* | | | Merge branch 'master' into careminsterMelanie2013-02-275-13/+273
|\ \ \ \ | | |/ / | |/| |
| * | | minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-272-2/+1
| * | | Show http poll handlers in separate http (poll) section of "show http-handler...Justin Clark-Casey (justincc)2013-02-271-2/+5
| * | | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-272-9/+266
* | | | Merge branch 'master' into careminsterMelanie2013-02-2720-216/+301
|\ \ \ \ | |/ / /
| * | | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-2714-212/+245
| * | | minor: remove warning in ConfigurationLoaderTestJustin Clark-Casey (justincc)2013-02-261-0/+2
| * | | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-264-22/+84
| * | | BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
* | | | Merge branch 'master' into careminsterMelanie2013-02-2616-269/+708
|\ \ \ \ | |/ / /
| * | | BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-256-39/+56
| |\ \
| | * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-256-39/+56
| * | | Mantis #6552 -- stricter error (crash) if server URL is malformed.Diva Canto2013-02-251-5/+2
| |/ /
| * | 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
| | |/ / | |/| |