f566dc0618
Remove unimplemented "debug teleport" console command
2013-01-10 22:42:12 +00:00
701ca1e4b8
Add "debug scene pbackup true|false" console command. This enables or disable periodic scene backup. For debug purposes.
...
If false, scene is still saved on shutdown.
2013-01-10 22:38:48 +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
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
442896cb1d
Remove duplicate registration of the help topics for the module commander
2012-11-23 02:44:51 +01:00
3c1a58c67a
Merge branch 'master' into careminster
2012-11-22 13:37:27 +00: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
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
5c48d7a378
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
2ccb53b42d
If no ISimulationDataStore or IEstateDataStore implementations could be loaded then halt with informative message rather than a later NRE.
...
Halt already occurs if the relevant config sections are not present.
So it also makes sense to halt if the implementations themselves cannot be loaded.
2012-11-14 04:17:39 +00:00
2e0ce70e63
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
8c130bcaf5
Remove the old style module loader and all references to it
2012-11-12 22:50:28 +00:00
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
09f4e72d6a
Fix memory leak where removing an NPC did not remove its circuits.
...
This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
2012-10-29 23:22:40 +00:00
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
16809bd0ea
minor: Make the error thrown logged when a simulator in grid mode is trying to set estate owner to a user that doesn't exist a little more obvious.
2012-10-26 02:36:58 +01:00
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
b5a3c74a5c
Add "active true|false" to "debug scene" console command.
...
This allows the scene update and maintenance loops to be started and stopped for debug purposes.
2012-10-12 02:52:08 +01:00
1f2472d0fc
Extend "show stats" command to "show stats [list|all|<category name>]"
...
This allows different categories of stats to be shown, with options to list categories or show all stats.
Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism.
This commit also adds percentage stats for packets and blocks reused from the packet pool.
2012-10-11 23:28:53 +01:00
7cc89cdadc
Add using clause I missed
2012-09-30 15:57:49 +01:00
f8a4b61954
Allow up to 12 simultaneous connections to a given endpoint rather than 2
2012-09-30 15:49:51 +01:00
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
ce468215d5
Support multi-region OAR files
...
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
2012-09-14 20:25:03 +01:00
45fe25de0d
Allow some more connections to try to ease lag.
2012-09-14 00:14:39 +02:00
d53a53d4c5
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
2012-09-12 00:10:48 +01:00
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
afb4e06f63
Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)
2012-09-09 17:41:10 +02:00
b379e790a2
Set the maximum number of concurrent connections to a service endpoint
...
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
2012-09-07 23:27:40 +02:00
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
e6fb458597
no-op change for cia.vc test
2012-08-20 22:18:29 +01:00
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-20 20:24:54 +01:00
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
5a1b6fdf06
Don't enable the thread watchdog until all regions are ready.
...
This is to avoid false positives when the machine is under heavy load whilst starting up.
2012-08-15 22:43:32 +01:00
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
374ebab574
Strip experimental tag from --publish option of "save oar" region console command
2012-08-03 23:54:17 +01:00
ecffcf7f65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2012-08-01 23:03:03 +01:00
cf16ca9bda
Create the ability for physics modules to request assets on demand by
...
themselves. For that, the physics module simply calls RequestAssetMethod, which
in turn points to Scene.PhysicsRequestAsset. This gives physics access to
the asset system without introducing unwanted knowledge of the scene class.
2012-08-01 22:37:38 +01:00
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
35efa88c26
Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.
...
This better reflects the long-term purpose of that project and matches Monitoring modules.
2012-07-25 23:11:50 +01:00
a1e99642c1
Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
...
This aims to capture the amount of memory that OpenSim turns over whilst operating a region.
This memory is not lost - apart from leaks it is reclaimed by the garbage collector.
However, the more memory that gets turned over the more work the GC has to do to reclaim it.
2012-07-25 22:29:40 +01:00
7da744566d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-20 09:31:06 +01:00
be39f03caa
minor: switch around mixed up circuit code and endpoint data in "show connections" region console command
2012-07-19 23:35:56 +01:00
64393a7ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-13 02:27:16 +01:00
15283d35f1
Extend "show circuits" to show circuit code, ip and viewer name.
...
Also change to use standard table formatting
"show circuits" and "show connections" console commands are very similar but access different data structures.
2012-07-12 23:09:36 +01:00
6a0de355e0
Add active status to "show connections"
2012-07-12 22:37:48 +01:00
ca412032e8
Put output for "show connections" command into standard table format.
...
Also moves into own method.
2012-07-12 21:36:33 +01:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
843112340e
Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not set
2012-07-06 00:37:45 +01:00
41a1903c60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-06-28 03:21:08 +01:00
87ca820f9b
Replace "kill uuid" console command with the more consistent "delete object uuid", which was present in the last opensim release.
2012-06-26 23:28:48 +01:00
32cc9c6094
Merge branch 'master' into careminster
2012-06-15 15:59:49 +01:00
c935f03467
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-15 03:32:43 +01:00
30d872caad
Merge branch 'master' into careminster
2012-06-15 02:53:34 +01:00
94517c8d5c
Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.
...
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
2012-06-15 02:51:52 +01:00
aeed4d3041
minor: Tell user the current debug http level if "debug http" console command is executed without a level parameter
2012-06-15 01:27:29 +01:00
478acfff34
When setting debug http level, do this for all known http servers, not just the main instance.
2012-06-15 01:24:36 +01:00
93ba0332c4
minor: Extend 'debug http' usage statement to 0..3 from 0..2
2012-06-14 23:54:12 +01:00
9825861f4a
Shuffle "debug http" levels so that 1 and 2 now cause different levels of warn to be logged if we receive invalid xml for xmlrpc.
2012-06-14 23:46:09 +01:00
12621201ba
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-06-13 02:15:12 +01:00
c53c55fed0
Add variable timer configureation for the timer_Script
...
Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60.
2012-06-12 17:15:56 -04:00
8c91e761c8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-09 16:28:22 +01:00
817f2d341d
Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and json stats from working
2012-06-08 23:36:53 +01:00
5f4f9f0230
Add regression test for client logout due to ack timeout.
2012-06-08 03:12:23 +01:00
5c162ccd57
Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly.
...
This no longer double counts child agent removals
2012-06-08 00:59:39 +01:00
48add77a4c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 00:43:39 +01:00
b56673c920
Fix bug with "kick user" reducing agent counts by 2 instead of 1.
...
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
2012-06-08 00:18:25 +01:00
c5af3e384c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2012-06-08 00:14:39 +01:00
e8cd9fbbb7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-06-07 23:33:40 +01:00
98b46d48fe
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-07 02:44:13 +01:00
e733fb32cf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-06-06 13:07:05 +01:00
3229e32b4e
Add replaceable region modules to the "show modules" command
2012-06-04 17:25:38 -04:00
e80161753f
Merge branch 'master' into careminster
2012-05-31 03:35:24 +01:00
0b02a4d42e
Add an optional mechanism for physics modules to collect and return arbitrary stats.
...
If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule
(http://opensimulator.org/wiki/Monitoring_Module )
This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings].
This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing.
This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds.
The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
2012-05-31 01:52:26 +01:00
8558a36506
Merge branch 'master' into careminster
2012-05-10 20:33:27 +01:00
de44734fe9
Saving estate state is really slow (relatively) and it gets
...
completely rewritten every time a region starts up. This
makes the data write only when the data was not already
read from the database.
There is a still a major race condition whenever two regions
share the same estate data, but at least it won't be triggered
on startup.
2012-05-10 09:08:40 -07:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
2bad430ed8
Put scene object related console commands into new "Objects" help category rather than "Regions"
2012-04-28 00:08:04 +01:00
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
4f17537555
Allow the user to enter help topics in upper or lowercase.
...
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
2012-03-24 03:07:01 +00:00
2190a62366
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 02:44:22 +00:00
18b3f1132e
Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code.
2012-03-23 01:21:43 +00:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
ab243f4a57
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
2012-03-21 01:13:44 +00:00
9671e43497
Replace "scene debug true false true" console command with "scene debug scripting true" or other parameters as appropriate.
...
This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
2012-03-21 01:02:58 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
aa881e8065
Allow comments to appear in command scripts (e.g. shutdown_commands.txt).
...
These can start with ; # or //
2012-03-16 02:07:26 +00:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
d6ebf2d6ca
Add ability to specify a default estate to be used when creating regions.
...
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
2012-03-10 01:27:05 +00:00
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
fa2a64564a
Move "change region" command into general category
2012-03-08 02:24:37 +00:00
650d761c06
Display help commander topics in capitalized form - the commands themselves are still lowercase.
...
Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
2012-03-08 02:17:45 +00:00
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
d2dfa4cfe7
Make parcel sale overlays work. No auction support.
2012-01-31 03:09:44 +00:00
71012ef883
Make parcel sale overlays work. No auction support.
2012-01-31 02:19:34 +01:00
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
154ba0124a
Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner.
2012-01-28 02:21:41 +00:00
4ce42762ee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
d053625663
Update save oar and save iar help responses to reflect new -h|--home
...
switches which replace -p|--profile ie: "save oar
--home=http://hg.osgrid.org:80 region.oar"
2012-01-25 15:59:07 -07:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
2d0412d366
Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly.
2012-01-24 22:35:55 +00:00
a4c2e7f599
Merge branch 'master' into careminster
2012-01-10 20:34:43 +00:00
a3bb1a81de
correct very minor typo in "debug scene" help
2012-01-10 18:47:30 +00:00
3deb52d399
Teleport Debugging
...
Move setting from ini to existing facitilies - thanks justincc
toggle with console command: debug teleport
2012-01-10 13:41:35 -05:00
1cc685e820
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-01-10 18:33:32 +00:00
b970d4f976
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-22 16:37:25 +00:00
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
4d065f0453
Provide user feedback on execution of "backup" region console command
2011-12-17 02:42:43 +00:00
7f019cc196
If a startup simulator script is present, run it after the normal region selection code rather than before.
...
This allows the script to change the selected region without having it immediately undone.
Thanks to Garmin Kawaguichi for this patch.
2011-12-17 00:27:19 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
33c6067098
Trigger a Jenkins build
2011-12-07 11:21:50 -05:00
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
2a9c9ae340
Provide more user feedback when "debug http" is set
2011-11-29 21:53:15 +00:00
658d02b5e9
Improve some of the debug help messages
2011-11-29 16:56:31 +00:00
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-11-29 16:15:52 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
df35720cf5
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
2011-11-14 20:34:49 +00:00
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
...
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
2011-11-11 17:16:52 -08:00
a4ec97cfdd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2011-11-11 23:43:18 +00:00
6ce3daff94
Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.
...
Addresses http://opensimulator.org/mantis/view.php?id=5786
2011-11-11 23:15:53 +00:00
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region 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
2011-11-10 22:56:13 +00:00
4939d99b57
Merge branch 'master' into bigmerge
2011-11-10 23:03:50 +00:00
b990914ec4
convert tabs from commit 3758306 to spaces
2011-11-10 21:04:12 +00:00
cb7ea68942
Merge branch 'master' into bigmerge
2011-11-10 20:56:44 +00:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
37583063ee
Allow custom setting for the console prompt
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-11-10 06:56:32 -05:00
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
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.
2011-10-31 16:42:28 -07:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead 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)
2011-10-25 20:24:21 +01:00
0cbba1da8d
Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge
2011-10-25 02:54:41 +01:00
353f0c0e03
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 02:14:39 +01:00
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
aeb4ff0274
Allow an avatar to be explicitly named to the "debug packet" command
2011-10-17 20:58:23 +01:00
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
b251423b11
Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge
2011-10-12 07:04:28 +01:00
77f9d98831
Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge
2011-10-12 01:41:59 +01:00
6af388ded9
Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge
2011-10-12 01:30:14 +01:00
66c06c5685
Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge
2011-10-11 23:02:19 +01:00
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
2011-10-11 21:32:24 +01:00
986a3838a6
Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge
2011-10-11 21:29:58 +01:00
5b40389352
Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge
2011-10-11 21:29:04 +01:00
8fac7c0650
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
2011-10-11 21:28:23 +01:00
1f78dc6504
remove the pointless slashes on the end of the (5!) different server stat 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.
2011-10-07 00:30:35 +01:00
8a8983b3d4
Add user ID to new estate user prompt, to make it clearer and consistent with the main create user prompts
2011-10-05 23:34:18 +01:00
b907a66f39
When creating a new user on the comand line, give the option of allowing a 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.
2011-10-04 23:48:35 +01:00
8caf3ed49e
Remove the unimplented "clear assets" command.
...
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
2011-09-24 02:22:47 +01:00
a00327d0e5
Fix build errors on Windows by adding missing OpenSim.Services.Base reference
2011-09-16 19:54:23 +01:00
9046651583
Pass any region scope through to the CreateUser() method
2011-09-16 00:36:43 +01:00
4ae4b14b5d
refactor: move estate owner setup code into separate method
2011-09-16 00:24:23 +01:00
522d6261f1
Correctly create a freshly created estate owner's default items and avatar entries on standalone if applicable.
2011-09-16 00:12:12 +01:00
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
7f318277f1
When creating an OAR, optionally exclude objects according to their permissions
2011-09-12 20:09:24 +01:00
1dd904b78e
Delay loading scripts until the scene has finished loading
2011-09-09 23:01:05 +01:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
2b26d2f1a5
prevent "create region" console command from being able to create a region with the same id as one that already exists.
...
Addresses http://opensimulator.org/mantis/view.php?id=5617
2011-08-06 01:35:01 +01:00
6d866ba6d5
Temporarily put in a log line which shows which locale the user is running in.
2011-07-29 23:43:35 +01:00
5c012cac54
Add a timer to monitor the heartbeat. Restart it if it's been dead for
...
5 seconds.
2011-07-25 04:16:53 +02:00
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
fba961c63f
Make default serverside_object_permissions = true since this better matches user expectations.
...
It also matches the default setting in the OpenSim.ini.example file
2011-07-01 23:06:46 +01:00
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
61f1c2b2c5
Write estate errors on startup to the log
2011-06-07 20:20:04 -07:00
b0ed0e63dc
Adding boolean alias for commandline switches like -save_crashes=yes
2011-06-01 21:14:16 +01:00
54096db30b
Fix: The command line switches 'save_crashes' and 'crash_dir' haven't actually worked
2011-06-01 21:06:43 +01:00
f02fbdbc68
Merge branch 'master' into careminster-presence-refactor
2011-05-27 01:10:02 +01:00
6f4d079fc5
Add a --noassets option to "save oar".
...
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.
2011-05-26 01:27:01 +01:00
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
f5ec332474
remove obsolete [StandAlone] config section parsing, none of which was actually used since being superseded by the connector architecture in 0.7
2011-05-06 22:41:07 +01:00
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01:00
0bd6bc8fba
create "config show" as a region console command synonym for "config get".
...
This is to create greater consistency with all the other show commands.
2011-04-11 21:59:26 +01:00
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
d31175060f
trivial whitespace removal to trigger a panda rebuild
2011-04-08 00:42:35 +01:00
15e0b55e66
Merge branch 'master' into careminster-presence-refactor
2011-04-03 14:16:28 +01:00
4f56c732bc
Comment out some startup logging lines to make up for the one I added earlier on.
...
Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
2011-04-02 02:29:42 +01:00
8f4bf43534
When asked to join region to existing estate, make first estate name the default instead of None
2011-04-01 00:55:05 +01:00
e1ceb461c0
Make default answer for 'do you wish to join region to an existing estate' yes instead of no.
2011-04-01 00:51:10 +01:00
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
2011-03-21 23:26:35 +00:00
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
2011-03-21 23:16:57 +00:00
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
2011-03-21 22:57:20 +00:00
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
2011-03-21 22:47:02 +00:00
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +00:00
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
24a768a99b
Merge branch 'master' into careminster-presence-refactor
2011-01-29 04:47:32 +00:00
a4acf485d7
minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful
2011-01-28 22:50:49 +00:00
1fcb919798
If a non-globbed included file from config cannot be found then warn the user
2011-01-28 22:46:29 +00:00
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
1baf63dbae
Move "show queues" command out of OpenSim.cs and into a separate module.
2011-01-20 22:57:12 +00:00
f50780f4c2
remove unimplemented "show assets" command
2011-01-20 21:56:48 +00:00
7f000ea88e
Correct "show queues" to show queued packet numbers for each client instead of bytes.
...
Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are.
2011-01-19 00:33:25 +00:00
eab0951a59
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
...
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +00:00
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
...
Prevents empty instances from hanging around when Mono.Addins messes up
2010-12-07 01:07:13 +01:00
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
349767f8a2
Merge branch 'master' into careminster-presence-refactor
2010-12-04 04:25:39 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00:00
af0deff7e9
Make "show queues [full]" behave like "show users [full]"
...
Now, "show queues" only shows root agents. "show queues full" will show child agents as well
2010-11-17 22:55:20 +00:00
c4f3175e17
add "Unacked bytes" column to "show queues"
...
This should show the number of bytes sent to the client that it has not yet acknowledged.
2010-11-17 22:55:19 +00:00
2a17c39dfe
Fix "show queues" console command
...
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
2010-11-17 22:55:19 +00:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
edc31adf95
Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all
...
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16 07:09:13 +01:00
e41b23a1a4
change --old-guids switch on the save oar command line to --version=<x>
...
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
2010-10-16 05:38:44 +01:00
1499607215
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-10-15 17:27:19 -07:00
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
9feef34a81
Merge branch 'master' into careminster-presence-refactor
2010-09-21 04:03:14 +01:00
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
d299f8b55c
Fix a small left over buglet and also add checking of the physics actor
...
position on backup. This way, ant object that has been moved will be
checked for ghost prims as soon as it is persisted.
2010-09-14 19:41:53 +02:00
Justin Clark-Casey (justincc)