| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -3/+28 | |
| |\ \ | |/ | ||||||
| | * | Alter commit 3758306 to allow region name to be substituted within a region ↵ | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+28 | |
| | | | | | | | | | | | | | | | | | console prompt This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash) e.g. "Region (\R) " is the current and continuing default prompt This renames custom_prompt in [Startup] to ConsolePrompt | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -3/+6 | |
| |\ \ | |/ | ||||||
| | * | convert tabs from commit 3758306 to spaces | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+6 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -2/+3 | |
| |\ \ | |/ | ||||||
| | * | Allow custom setting for the console prompt | GuduleLapointe | 2011-11-10 | 1 | -2/+3 | |
| | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 1 | -0/+13 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||||
| | * | Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵ | Dan Lake | 2011-10-31 | 1 | -0/+13 | |
| | | | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -0/+1 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | |||||
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | |||||
| * | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+8 | |
| |\ \ | |/ | ||||||
| | * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -4/+8 | |
| | | | ||||||
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+1 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -4/+1 | |
| | | | | | | | | | the others | |||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+1 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -2/+1 | |
| | | | | | | | | | done for most other scene config params | |||||
| * | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+3 | |
| |\ \ | |/ | ||||||
| | * | remove the pointless slashes on the end of the (5!) different server stat ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path. | |||||
| * | | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Add user ID to new estate user prompt, to make it clearer and consistent ↵ | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -1/+1 | |
| | | | | | | | | | with the main create user prompts | |||||
| * | | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+10 | |
| |\ \ | |/ | ||||||
| | * | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+10 | |
| | | | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership. | |||||
| * | | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+0 | |
| |\ \ | |/ | ||||||
| | * | Remove the unimplented "clear assets" command. | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -9/+0 | |
| | | | | | | | | | | | This was a bizarre relic of a bygone age that had no implementations. If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command | |||||
| * | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+2 | |
| |\ \ | |/ | ||||||
| | * | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 1 | -1/+2 | |
| | | | ||||||
| * | | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+11 | |
| |\ \ | |/ | ||||||
| | * | Pass any region scope through to the CreateUser() method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -2/+11 | |
| | | | ||||||
| * | | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge | Melanie | 2011-10-11 | 1 | -45/+50 | |
| |\ \ | |/ | ||||||
| | * | refactor: move estate owner setup code into separate method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -45/+50 | |
| | | | ||||||
| * | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+50 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs | |||||
| | * | Correctly create a freshly created estate owner's default items and avatar ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+50 | |
| | | | | | | | | | entries on standalone if applicable. | |||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 2 | -4/+8 | |
| |\ \ | |/ | ||||||
| | * | When creating an OAR, optionally exclude objects according to their permissions | Oren Hurvitz | 2011-09-12 | 1 | -4/+6 | |
| | | | ||||||
| | * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+2 | |
| | | | ||||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -1/+21 | |
| |\ \ | |/ | ||||||
| | * | prevent "create region" console command from being able to create a region ↵ | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -1/+15 | |
| | | | | | | | | | | | | | with the same id as one that already exists. Addresses http://opensimulator.org/mantis/view.php?id=5617 | |||||
| | * | Temporarily put in a log line which shows which locale the user is running in. | Justin Clark-Casey (justincc) | 2011-07-29 | 2 | -0/+6 | |
| | | | ||||||
| * | | Add a timer to monitor the heartbeat. Restart it if it's been dead for | Melanie | 2011-07-25 | 1 | -0/+1 | |
| | | | | | | | | | 5 seconds. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Make default serverside_object_permissions = true since this better matches ↵ | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | user expectations. It also matches the default setting in the OpenSim.ini.example file | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -2/+6 | |
| |\ \ | |/ | ||||||
| | * | Write estate errors on startup to the log | Oren Hurvitz | 2011-06-07 | 1 | -2/+2 | |
| | | | ||||||
| | * | Adding boolean alias for commandline switches like -save_crashes=yes | Makopoppo | 2011-06-01 | 1 | -0/+2 | |
| | | | ||||||
| | * | Fix: The command line switches 'save_crashes' and 'crash_dir' haven't ↵ | Makopoppo | 2011-06-01 | 1 | -0/+2 | |
| | | | | | | | | | actually worked | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-27 | 1 | -4/+5 | |
| |\ \ | |/ | ||||||
| | * | Add a --noassets option to "save oar". | Justin Clark-Casey (justincc) | 2011-05-26 | 1 | -4/+5 | |
| | | | | | | | | | | | This switch stops any assets being saved in the oar. This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -15/+1 | |
| |\ \ | |/ | ||||||
| | * | remove obsolete [StandAlone] config section parsing, none of which was ↵ | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -15/+1 | |
| | | | | | | | | | actually used since being superseded by the connector architecture in 0.7 | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -5/+13 | |
| |\ \ | |/ | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |