aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-242-2/+27
|\
| * Shell Environment Variables in configBlueWall2011-11-232-2/+27
* | Merge branch 'master' into bigmergeMelanie2011-11-141-18/+0
|\ \ | |/
| * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-18/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-111-1/+1
|\ \ | |/
| * Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.Justin Clark-Casey (justincc)2011-11-111-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-101-3/+28
|\ \ | |/
| * Alter commit 3758306 to allow region name to be substituted within a region c...Justin Clark-Casey (justincc)2011-11-101-3/+28
* | Merge branch 'master' into bigmergeMelanie2011-11-101-3/+6
|\ \ | |/
| * convert tabs from commit 3758306 to spacesJustin Clark-Casey (justincc)2011-11-101-3/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-101-2/+3
|\ \ | |/
| * Allow custom setting for the console promptGuduleLapointe2011-11-101-2/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-011-0/+13
|\ \ | |/
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show modules...Dan Lake2011-10-311-0/+13
* | Merge branch 'master' into bigmergeMelanie2011-10-261-0/+1
|\ \ | |/
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-251-0/+1
* | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmergeMelanie2011-10-251-4/+8
|\ \ | |/
| * Allow an avatar to be explicitly named to the "debug packet" commandJustin Clark-Casey (justincc)2011-10-171-4/+8
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-252-4/+1
|\ \ | |/
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-152-4/+1
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-252-2/+1
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-152-2/+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
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a UU...Justin Clark-Casey (justincc)2011-10-041-1/+10
* | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmergeMelanie2011-10-111-9/+0
|\ \ | |/
| * Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-9/+0
* | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-111-1/+2
|\ \ | |/
| * Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-1/+2
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-111-2/+11
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-161-2/+11
* | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-111-45/+50
|\ \ | |/
| * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-161-45/+50
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-0/+50
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-161-0/+50
* | Bring us up to date.Tom2011-09-142-4/+8
|\ \ | |/
| * When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-121-4/+6
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-091-0/+2
* | Resolve merge commits, stage 1Tom2011-09-042-1/+21
|\ \ | |/
| * prevent "create region" console command from being able to create a region wi...Justin Clark-Casey (justincc)2011-08-061-1/+15
| * Temporarily put in a log line which shows which locale the user is running in.Justin Clark-Casey (justincc)2011-07-292-0/+6
* | Add a timer to monitor the heartbeat. Restart it if it's been dead forMelanie2011-07-251-0/+1
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-1/+1
|\ \ | |/
| * Make default serverside_object_permissions = true since this better matches u...Justin Clark-Casey (justincc)2011-07-011-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-092-2/+6
|\ \ | |/
| * Write estate errors on startup to the logOren Hurvitz2011-06-071-2/+2
| * Adding boolean alias for commandline switches like -save_crashes=yesMakopoppo2011-06-011-0/+2
generated by cgit v1.1 at 2024-11-08 11:40:31 +0000