aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-151-36/+38
* Merge branch 'master' into careminsterMelanie2012-10-261-1/+1
|\
| * minor: Make the error thrown logged when a simulator in grid mode is trying t...Justin Clark-Casey (justincc)2012-10-261-1/+1
* | Merge branch 'master' into careminsterMelanie2012-10-121-37/+35
|\ \ | |/
| * Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-37/+35
* | Merge branch 'master' into careminsterMelanie2012-08-161-2/+7
|\ \ | |/
| * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-151-2/+7
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+1
|\ \ | |/
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+1
* | Merge branch 'master' into careminsterMelanie2012-07-281-18/+20
|\ \ | |/
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
| * Add experimental "OpenSim object memory churn" statistics to output of region...Justin Clark-Casey (justincc)2012-07-251-17/+19
* | Merge branch 'master' into careminsterMelanie2012-06-091-1/+1
|\ \ | |/
| * Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and jso...Justin Clark-Casey (justincc)2012-06-081-0/+2
| * Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-081-2/+0
* | Merge branch 'master' into careminsterMelanie2012-05-101-5/+7
|\ \ | |/
| * Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-101-5/+7
* | Merge branch 'master' into careminsterMelanie2012-05-051-1/+10
|\ \ | |/
| * Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-031-1/+10
* | Merge branch 'master' into careminsterMelanie2012-03-251-5/+6
|\ \ | |/
| * Allow the user to enter help topics in upper or lowercase.Justin Clark-Casey (justincc)2012-03-241-5/+6
* | Merge branch 'master' into careminsterMelanie2012-03-231-2/+1
|\ \ | |/
| * Rename Scene.StartTimer() to Start() - this method no longer uses a timer. C...Justin Clark-Casey (justincc)2012-03-231-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-111-67/+152
|\ \ | |/
| * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152
* | Merge branch 'master' into careminsterMelanie2012-03-081-9/+11
|\ \ | |/
| * Display help commander topics in capitalized form - the commands themselves a...Justin Clark-Casey (justincc)2012-03-081-4/+6
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-081-6/+6
* | Merge branch 'master' into careminsterMelanie2012-01-311-0/+1
|\ \ | |/
| * Make parcel sale overlays work. No auction support.Melanie2012-01-311-3/+3
* | Make parcel sale overlays work. No auction support.Melanie2012-01-311-3/+3
* | Merge branch 'master' into careminsterMelanie2012-01-251-3/+3
|\ \ | |/
| * Make errors reported by OpenSim when it halts because it can't find certain c...Justin Clark-Casey (justincc)2012-01-241-3/+3
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+1
|\ \ | |/
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-1/+1
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-0/+1
|\ \ | |/
| * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-051-3/+3
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-051-3/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-241-1/+8
|\ \ | |/
| * Shell Environment Variables in configBlueWall2011-11-231-1/+8
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-151-1/+1
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-151-1/+1
* | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-3/+3
|\ \ | |/
| * remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-071-3/+3
* | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Add user ID to new estate user prompt, to make it clearer and consistent with...Justin Clark-Casey (justincc)2011-10-051-1/+1
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+10
|\ \ | |/
generated by cgit v1.1 at 2024-12-13 20:55:42 +0000