Melanie
01f06b90dd
Merge branch 'careminster' into avination
2012-11-23 03:42:04 +00:00
Melanie
ae8733bf59
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-23 03:39:49 +00:00
Justin Clark-Casey (justincc)
36c6edac69
Remove the redundant BypassPermissions() checks in EstateManagmentModule.
...
This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
2012-11-23 03:29:50 +00:00
Justin Clark-Casey (justincc)
9b60c14bb1
minor: Add some console feedback on region restart and log who requested a region restart if done from the viewer.
2012-11-23 03:05:30 +00:00
Justin Clark-Casey (justincc)
8c8c8a00a4
Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working.
...
This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
2012-11-23 02:22:30 +00:00
Melanie
6581097001
Fix new command console code to match the output of the original while keeping
...
the new features
2012-11-23 03:20:15 +01:00
Melanie
c96729b55d
Add a newline before the constant help text
2012-11-23 02:06:05 +00:00
Justin Clark-Casey (justincc)
049987925d
Add regression test for checking scene close when SceneManager is asked to close
2012-11-23 02:05:30 +00:00
Melanie
2e7b72d3da
Revert help to display a full command list. Leave the help categories in as
...
"help categories" in case it turns out useful in the future. May not work.
2012-11-23 02:04:24 +00:00
Melanie
b09fb01571
Fix a build break introduced by us having a more efficient DoubleDictionary
...
where core has a simple list
2012-11-23 02:03:44 +00:00
Justin Clark-Casey (justincc)
eb1921ff93
Add "help all" console command which will list all commands alphabetically in a single list
2012-11-23 01:52:48 +00:00
Melanie
2abddedc34
Merge branch 'master' into careminster
2012-11-23 01:49:25 +00:00
Melanie
442896cb1d
Remove duplicate registration of the help topics for the module commander
2012-11-23 02:44:51 +01:00
Melanie
c2e89334b8
Merge branch 'master' into careminster
2012-11-23 01:44:35 +00:00
justincc
7133b6bb4f
Fix recent windows build break.
...
Add missing OpenSim.Framework.Servers reference
2012-11-23 01:43:11 +00:00
Justin Clark-Casey (justincc)
61808d148e
Fix regression where we stopped closing scenes on simulator exit.
...
If we don't do this, then these scenes don't get deregistered from the grid, amongst other things.
Regression was introduced in commit 8c130bc
(Mon Nov 12 22:50:28 2012 +0000)
2012-11-23 01:01:39 +00:00
Melanie
2bdd3eb918
Merge branch 'master' into careminster
2012-11-22 14:47:57 +00:00
Melanie
3b2caa63b0
Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
...
conflicts with PhysicsShape type defined in later libOMV
2012-11-22 14:45:41 +00:00
Melanie
3c1a58c67a
Merge branch 'master' into careminster
2012-11-22 13:37:27 +00:00
Melanie
c3e1701d43
Merge branch 'avination' into careminster
2012-11-22 13:33:34 +00:00
teravus
98b0cb8df8
* While this is not producing any problems.. and does help in low bandwidth situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
2012-11-22 08:13:35 -05:00
Justin Clark-Casey (justincc)
3ce00e97cc
Factor out command script code.
...
This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
2012-11-22 05:57:20 +00:00
Justin Clark-Casey (justincc)
9fcf3f1a3f
Make "config show/set/get/save" console commands available on all servers
2012-11-22 05:48:41 +00:00
Justin Clark-Casey (justincc)
8269d2b893
Factor out common pid file creation and removal code.
...
Log path at which pid file is created or reason for failure to create.
2012-11-22 05:14:43 +00:00
Justin Clark-Casey (justincc)
42e87a6582
Add "get log level" command - this returns the current server session console logging level.
...
This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
2012-11-22 04:57:45 +00:00
Justin Clark-Casey (justincc)
34ff96a119
Remove unused BaseOpenSimServer.ShowHelp()
2012-11-22 04:52:29 +00:00
Justin Clark-Casey (justincc)
4c4379b50f
Make "set log level" command available across all servers
2012-11-22 04:50:09 +00:00
Justin Clark-Casey (justincc)
45d1e6ab09
Make "show info" command available across all servers
...
This helpfully lists version information, startup location and console log level
2012-11-22 04:45:53 +00:00
Justin Clark-Casey (justincc)
cf03d6ea92
Factor out common registration of "show uptime" command
2012-11-22 04:11:03 +00:00
Justin Clark-Casey (justincc)
5c48d7a378
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
Justin Clark-Casey (justincc)
74a20a62ee
refactor: Factor out copy/pasted server uptime report code
2012-11-22 03:43:21 +00:00
Melanie
5f4ac1c5a3
Merge branch 'master' into careminster
2012-11-22 03:40:30 +00:00
Melanie
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
Justin Clark-Casey (justincc)
448811ccdd
If an asset POST does not contain well-formed XML, return a 400 (Bad Request) HTTP status rather than simply dropping the request.
2012-11-22 03:03:37 +00:00
Justin Clark-Casey (justincc)
33a4f07c4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-22 03:01:26 +00:00
Robert Adams
56ef180c92
BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed.
2012-11-21 16:44:02 -08:00
Robert Adams
cbc7e7bf85
BulletSim: Make avatar capsule so it is not circular.
...
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
Robert Adams
4a0de01704
BulletSim: Properly position mesh terrain on creation (fixes terrain not appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
2012-11-21 16:43:45 -08:00
Robert Adams
a59368c4a1
BulletSim: add terrainImplementation parameter with default to Mesh.
2012-11-21 16:43:37 -08:00
Robert Adams
2dc7e9d3fa
BulletSim: fix line endings to be all Linux style (windows style keeps creeping in)
2012-11-21 16:43:29 -08:00
Robert Adams
34cbc738a8
BulletSim: enablement and debugging of mesh terrain.
2012-11-21 16:43:21 -08:00
Robert Adams
71b9640dfa
BulletSim: pull heightmap implementation out of the terrain manager so a mesh terrain can be implemented.
2012-11-21 16:43:14 -08:00
Robert Adams
8dd5813889
BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually having mesh avatars.
2012-11-21 16:43:06 -08:00
Robert Adams
65e55ada87
BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to same.
2012-11-21 16:42:58 -08:00
Robert Adams
d6db0d5740
BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to that enum.
2012-11-21 16:42:50 -08:00
Robert Adams
4d29488216
BulletSim: change PositionSanityCheck to apply a force to correct position corrections (below ground and floating).
2012-11-21 16:42:42 -08:00
Robert Adams
2f5fe4b88e
BulletSim: tweek avatar capsule parameters so avatar feet don't go below ground. This solves the bouncing, short avatar problem (Mantis 6403).
2012-11-21 16:42:34 -08:00
Justin Clark-Casey (justincc)
bac8ac32da
Add regression test for a good request made to the asset service post handler.
...
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
2012-11-21 23:42:34 +00:00
Melanie
45eedb635a
Merge branch 'master' into careminster
2012-11-20 20:25:15 +00:00
Justin Clark-Casey (justincc)
f656adee31
If GetAgents() is called with an empty userIDs array then don't bother with a useless potentially network call on the scene presence service connector.
...
This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument"
which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
2012-11-20 10:22:49 +00:00