aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Add support for user preferences (im via email)"Melanie2013-12-071-8/+0
* Merge branch 'master' into careminsterMelanie2013-12-071-0/+8
|\
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+8
* | Merge branch 'master' into careminsterMelanie2013-11-238-10/+34
|\ \ | |/
| * rename private field ACD.ViewerInternal to m_viewerInternal in line with conv...Justin Clark-Casey (justincc)2013-11-191-5/+6
| * Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has be...Justin Clark-Casey (justincc)2013-11-191-1/+1
| * Normalize viewer version string to accomodate new style version reporting in ...Latif Khalifa2013-11-191-1/+24
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-157-9/+9
* | Merge branch 'master' into careminsterMelanie2013-11-081-1/+0
|\ \ | |/
| * Remove legacy sqlite lines added internally by OpenSimulator to the [Startup]...Justin Clark-Casey (justincc)2013-10-281-1/+0
* | Merge branch 'master' into careminsterMelanie2013-11-035-0/+904
|\ \ | |/
| * * Add a session concurrency option per key. Allows developer/config to speci...teravus2013-10-094-23/+102
| * * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belo...teravus2013-10-071-1/+29
| * * Refactorteravus2013-10-074-410/+213
| * * Added a Basic DOS protection container/base object for the most common HTTP...teravus2013-10-074-0/+994
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-061-0/+1
|\ \
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-0/+1
* | | Merge branch 'master' into careminsterMelanie2013-10-0613-14/+77
|\ \ \ | |/ / |/| / | |/
| * * Add an initial complete frame timeout to the WebSocket processor to make it...teravus2013-10-041-2/+65
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-0412-12/+12
* | Merge branch 'master' into careminsterMelanie2013-10-044-8/+35
|\ \ | |/
| * refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ...Justin Clark-Casey (justincc)2013-09-271-2/+2
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ...Justin Clark-Casey (justincc)2013-09-271-5/+7
| * Don't use 'Indented' formatting for RpcXml responses.Aleric Inglewood2013-09-221-1/+15
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+11
| * Make new regions PG by default instead of Mature.Justin Clark-Casey (justincc)2013-09-201-1/+1
* | Merge branch 'master' into careminsterMelanie2013-09-072-8/+7
|\ \ | |/
| * minor simplification of some unix date functions in Util. No functional change.Justin Clark-Casey (justincc)2013-09-031-5/+3
| * Add experimental "show grid users online" console command to show grid users ...Justin Clark-Casey (justincc)2013-09-031-4/+4
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to allo...Justin Clark-Casey (justincc)2013-09-021-1/+2
* | Merge branch 'master' into careminsterMelanie2013-09-012-3/+28
|\ \ | |/
| * minor: Correct typo on "debug stats record start" messageJustin Clark-Casey (justincc)2013-08-231-1/+1
| * Make it possible to disconnected a specified number of bots via the pCampbot ...Justin Clark-Casey (justincc)2013-08-191-2/+27
* | Merge branch 'master' into careminsterMelanie2013-08-171-1/+1
|\ \ | |/
| * remove mono compiler warnings from PollServiceRequestManagerJustin Clark-Casey (justincc)2013-08-171-4/+2
| * minor: remove mono compiler warning in StatsManagerJustin Clark-Casey (justincc)2013-08-171-1/+1
* | Merge branch 'master' into careminsterMelanie2013-08-118-152/+363
|\ \ | |/
| * Stats treaking. Update ToOSDMap for Stat and PercentageStat to returnRobert Adams2013-08-104-150/+235
| * Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.Robert Adams2013-08-081-0/+6
| * Add a JSON web fetch of the statististics managed by StatsManager.Robert Adams2013-08-081-0/+31
| * minor: Remove console lines at bottom of FakeParcelIDTests() regression test ...Justin Clark-Casey (justincc)2013-08-081-2/+0
| * Fixed error in BuildFakeParcelID() which was detected by regression tests.Kevin Cozens2013-08-081-2/+2
| * Added regression tests for the routines related to fake parcel IDs.Kevin Cozens2013-08-081-0/+84
| * Additional regression tests for the location routines in Location.csKevin Cozens2013-08-081-0/+7
* | Merge branch 'master' into careminsterMelanie2013-08-079-20/+725
|\ \ | |/
| * minor: add some method doc to ScenePresence fields used for entity transfer, ...Justin Clark-Casey (justincc)2013-08-071-0/+6
| * Add file missing from last commit 4c2f6deJustin Clark-Casey (justincc)2013-08-061-0/+108
| * Add the experimental ability to dump stats (result of command "show stats all...Justin Clark-Casey (justincc)2013-08-061-12/+40
| * Add "debug threadpool status" console command to show min/max/current worker/...Justin Clark-Casey (justincc)2013-08-061-0/+23
| * Add "debug comms status" command to show current debug comms settingsJustin Clark-Casey (justincc)2013-08-051-0/+11