 Justin Clark-Casey (justincc)
|
7f019cc196
If a startup simulator script is present, run it after the normal region selection code rather than before.
|
12 years ago |
 Melanie
|
5ab536a1e9
Merge branch 'master' into bigmerge
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
|
12 years ago |
|
Melanie
|
b60ff651a3
Merge branch 'master' into bigmerge
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
2a9c9ae340
Provide more user feedback when "debug http" is set
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
658d02b5e9
Improve some of the debug help messages
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
|
12 years ago |
|
Melanie
|
df35720cf5
Merge branch 'master' into bigmerge
|
13 years ago |
 Dan Lake
|
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
|
13 years ago |
|
Melanie
|
a4ec97cfdd
Merge branch 'master' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
6ce3daff94
Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region console prompt
|
13 years ago |
|
Melanie
|
4939d99b57
Merge branch 'master' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
b990914ec4
convert tabs from commit 3758306 to spaces
|
13 years ago |
|
Melanie
|
cb7ea68942
Merge branch 'master' into bigmerge
|
13 years ago |
|
Melanie
|
a1426739a2
Merge branch 'master' into bigmerge
|
13 years ago |
 GuduleLapointe
|
37583063ee
Allow custom setting for the console prompt
|
13 years ago |
|
Melanie
|
b69f679122
Merge branch 'master' into bigmerge
|
13 years ago |
|
Dan Lake
|
3c55f3015f
Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules.
|
13 years ago |
|
Melanie
|
fd22159d0c
Merge branch 'master' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
|
13 years ago |
|
Melanie
|
0cbba1da8d
Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
aeb4ff0274
Allow an avatar to be explicitly named to the "debug packet" command
|
13 years ago |
|
Melanie
|
66c06c5685
Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
8caf3ed49e
Remove the unimplented "clear assets" command.
|
13 years ago |
 Tom
|
5484c9b585
Bring us up to date.
|
13 years ago |
 Oren Hurvitz
|
7f318277f1
When creating an OAR, optionally exclude objects according to their permissions
|
13 years ago |
|
Tom
|
66dec3b874
Resolve merge commits, stage 1
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
2b26d2f1a5
prevent "create region" console command from being able to create a region with the same id as one that already exists.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
6d866ba6d5
Temporarily put in a log line which shows which locale the user is running in.
|
13 years ago |
