c754003944
Merge branch 'master' into connector_plugin
...
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
cf670c01cc
Merge branch 'avination' into careminster
2012-11-25 14:14:20 +00:00
fd7a83f439
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
2012-11-25 14:13:50 +00:00
ae8d3815c7
Merge branch 'teravuswork' of careminster:/var/git/careminster into teravuswork
2012-11-24 22:10:15 -05:00
a118001181
* Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
2012-11-24 22:09:34 -05:00
1487d69734
* Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
2012-11-24 22:01:34 -05:00
62244b5ea5
don't zero constant force and torque in selection
2012-11-24 22:46:24 +00:00
02db8b9adb
Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are functionally identical.
...
Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
2012-11-24 03:49:23 +00:00
f254af29ac
avoid potencial NullReferenceException
2012-11-24 03:39:37 +00:00
a4ce63d0cd
Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInventoryAccessModule() and re-enable in test suite.
2012-11-24 03:38:15 +00:00
22d4c52ffc
Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests
2012-11-24 03:15:24 +00:00
e9be85442f
In ArchiverTests, use the local instantiated SceneManager rather than potentially cross-contaminating tests by relying on the static SceneManager.Instance
2012-11-24 02:57:43 +00:00
82690e1384
Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present.
...
Aims to address http://opensimulator.org/mantis/view.php?id=6355
As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records
(i.e. no membership data etc)
This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
2012-11-24 02:43:31 +00:00
cda531bc3c
minor: Add some currently commented out debug log lines for investigating issues resolving group IDs for land parcels on OAR loading where groups do not exist
2012-11-23 05:44:31 +00:00
999cb4b20c
Make "show threads" and "thread abort" console commands available on all servers
2012-11-23 04:40:49 +00:00
e0a3e01850
Make "force gc" console command available across all servers
2012-11-23 04:27:04 +00:00
4b46a0d536
Make "show version" console command available across all servers
2012-11-23 04:19:08 +00:00
065d6d6fe1
Delete unused BaseHttpServer.HandleAgentRequest()
2012-11-23 04:15:21 +00:00
edbdbd44b9
Enable further client stack packet pooling by default by setting RecycleBaseUDPPackets = true by default.
...
This reduces base memory churn of every client connection, improving the garbage collection situation.
The effect is a significant portion of base load (an avatar standing still on a completely blank island)
but will probably still be swallowed up by other memory use on active regions.
Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains
in case a switch back is needed.
2012-11-23 04:09:45 +00:00
acc1810af2
minor: remove some mono compiler warnings
2012-11-23 04:08:17 +00:00
1f336579c8
minor: Make note in log if scene was restarted due to an unrecoverable physics error
2012-11-23 04:06:48 +00:00
f473252fa8
Add AllowRegionRestartFromClient setting to [EstateManagement] section of OpenSim.ini.
...
Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate.
One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules,
though these should be fixed as soon as practicable.
Default is true, as has been the case historically.
2012-11-23 03:56:53 +00:00
01f06b90dd
Merge branch 'careminster' into avination
2012-11-23 03:42:04 +00:00
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
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
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
edb3a9596b
Remove a superfluous newline from help
2012-11-23 03:31:44 +01:00
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
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
c96729b55d
Add a newline before the constant help text
2012-11-23 02:06:05 +00:00
049987925d
Add regression test for checking scene close when SceneManager is asked to close
2012-11-23 02:05:30 +00:00
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
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
eb1921ff93
Add "help all" console command which will list all commands alphabetically in a single list
2012-11-23 01:52:48 +00:00
2abddedc34
Merge branch 'master' into careminster
2012-11-23 01:49:25 +00:00
442896cb1d
Remove duplicate registration of the help topics for the module commander
2012-11-23 02:44:51 +01:00
c2e89334b8
Merge branch 'master' into careminster
2012-11-23 01:44:35 +00:00
7133b6bb4f
Fix recent windows build break.
...
Add missing OpenSim.Framework.Servers reference
2012-11-23 01:43:11 +00:00
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
2012-11-23 01:01:39 +00:00
2bdd3eb918
Merge branch 'master' into careminster
2012-11-22 14:47:57 +00:00
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
3c1a58c67a
Merge branch 'master' into careminster
2012-11-22 13:37:27 +00:00
c3e1701d43
Merge branch 'avination' into careminster
2012-11-22 13:33:34 +00:00
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
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
9fcf3f1a3f
Make "config show/set/get/save" console commands available on all servers
2012-11-22 05:48:41 +00:00
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
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
34ff96a119
Remove unused BaseOpenSimServer.ShowHelp()
2012-11-22 04:52:29 +00:00
4c4379b50f
Make "set log level" command available across all servers
2012-11-22 04:50:09 +00:00
BlueWall