ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-07 12:08:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,776 Commits 5 Branches 97 Tags
ddd38a3dea70845ede575ccece4c83c10602d3b5
Commit Graph

946 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
4e6f7435d0 Add UUID and ready status (whether region has finished starting up) to "show regions" console output. 2014-03-05 01:23:48 +00:00
Dev Random
6955190c7d Add Util method to load OpSys env vars 2014-02-26 23:39:45 +00:00
Robert Adams
79200ed270 Fix displacement and location operations on legacy trees and grass in 
the 'load oar' and 'scene' commands. Before they  were ignored but the
code now relies on the SOG.IsAttachment function for attachmentness.
 2014-02-15 17:10:20 -08:00
Robert Adams
41b6602a77 Add "--no-objects" parameter to 'load oar'. 2014-02-02 22:16:01 -08:00
Robert Adams
2a4dd34616 Change new 'load oar' parameters to be hyphenated to be consistant with 
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
 2014-02-02 12:21:18 -08:00
Robert Adams
8eec717f5f Merge branch 'master' into varregion 2014-01-28 08:50:28 -08:00
Justin Clark-Casey (justincc)
f7172095e0 Convert tabs to spaces from previous commit 8c2b41b01 2014-01-28 00:04:55 +00:00
Dev Random
8c2b41b01d Make inidirectory files supercede distro files 2014-01-27 23:56:10 +00:00
Robert Adams
5e6a47f13f varregion: remove --noterrain and --noparcel parameters in 'load oar'. 
Add --forceterrain and --forceparcel to 'load oar'. In order to not change
the operation of --merge (which does an object merge and suppresses terrain
and parcel information loading), added the --force* parameters to be used
when loading multiple oars to build up a varregion.

Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to
the loaded oar objects before displacing. The rotation is in degrees (pos or neg)
and the center defaults to "<128, 128, 0>".
 2014-01-19 12:45:16 -08:00
Robert Adams
6fbfb47b92 varregion: add --noterrain and --noparcel to 'load oar'. 
--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
 2014-01-19 11:03:08 -08:00
Robert Adams
dd6db72939 varregion: add --displacement parameter to 'load oar'. 
Adds displacment to all objects and terrain loaded from the oar.
As an example, if you have a 512x512 region and an old 256x256 oar, doing
  load oar --displacement "<128,128,0>" oarFile.oar
will load the object (and terrain) into the middle of the 512x512 region.
If displacement is not specified, 'load oar' works like it always has.
If you have a 5
 2014-01-19 10:09:43 -08:00
Robert Adams
6937eec258 Merge branch 'master' into varregion 
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-17 06:18:13 -08:00
Robert Adams
13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
 2013-12-14 07:53:01 -08:00
dahlia
0875050161 Add console utility commands "scale scene" and "translate scene". Note that repeated use of these commands will induce floating point accumulation errors. Please back up your region before using. 2013-12-10 13:57:18 -08:00
Robert Adams
31bacfbb63 Merge branch 'master' into varregion 2013-12-01 15:51:42 -08:00
dahlia
e52a8d388f "rotate scene" command now uses Constants.RegionSize / 2 to pick the center of rotation and center can be optionally overridden in the command line 2013-11-26 21:07:37 -08:00
dahlia
5a9ec0748b add a "rotate scene" console command. Seems to work for prims/sculpts/mesh but not for foliage, don't know why. Also doesn't work on terrain. Successive use of this command will likely introduce floating point error accumulation. Back up your region before using it :) 2013-11-26 17:18:44 -08:00
Robert Adams
3193bcaae1 Merge branch 'master' into varregion 2013-11-24 07:23:12 -08:00
Justin Clark-Casey (justincc)
b44c69807d Fix bug where "show modules" would accidentally list all the shared modules again as "non-shared" 
Addresses http://opensimulator.org/mantis/view.php?id=6860
 2013-11-19 23:53:15 +00:00
Robert Adams
604b39cea9 Merge branch 'master' into varregion 2013-11-15 14:56:13 -08:00
Justin Clark-Casey (justincc)
7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00:00
Robert Adams
c931b16c1f Merge branch 'master' into varregion 2013-11-04 22:12:57 -08:00
Robert Adams
f2810bf03a varregion: add plumbing to pass region size from Scene down to the 
physics engine.
Older physics engines will default to the legacy region size.
Update BulletSim to use the new region size information.
 2013-11-04 22:10:54 -08:00
Justin Clark-Casey (justincc)
39de7614ec Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section. 
These are long unused but confusingly will be seen in the [Startup] section on a "config save".
 2013-10-28 18:03:34 +00:00
Robert Adams
317c04fe17 VarRegion: change RegionInfo storage of region coordinates from region 
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
 2013-09-28 07:33:52 -07:00
Justin Clark-Casey (justincc)
b16bc7b01c refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. 
Adds IScene.CloseAgent() to replace RemoveClient()
 2013-09-27 19:14:21 +01:00
dahlia
b704de9bf8 minor code formatting for the sake of consistency and readability 2013-09-26 16:27:11 -07:00
BlueWall
a97f6f8668 Fix configuration/ini expansion issue. Thanks to smxy for testing. 2013-09-07 13:11:31 -04:00
BlueWall
a8c0e16e47 Initialization: move key expansion out to operate on all sources and not just environment variables 2013-08-29 14:35:56 -04:00
Justin Clark-Casey (justincc)
23ca1f859e minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads" 2013-08-09 18:27:26 +01:00
Robert Adams
d9bd6e6b5b Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini. 
Add 'callback' query parameter to managed stats return to return function
form of JSON data.
 2013-08-08 09:45:30 -07:00
Robert Adams
50c163ae6c Add a JSON web fetch of the statististics managed by StatsManager. 
Disabled by default. Enable by setting
[Startup]ManagedStatsRemoteFetchURI="Something"
and thereafter "http://ServerHTTPPort/Something/" will return all the managed
stats (equivilent to "show stats all" console command).
Accepts queries "cat=", "cont=" and "stat=" to specify statistic category,
container and statistic names. The special name "all" is the default and returns
all values in that group.
 2013-08-08 09:45:01 -07:00
Justin Clark-Casey (justincc)
638c3d25b0 Remove never implemented stub modules commands (list, load, unload) from back in 2009. 
"show modules" is the functional console command that will show currently loaded modules.
Addresses http://opensimulator.org/mantis/view.php?id=6730
 2013-08-08 00:48:22 +01:00
Diva Canto
3194ffdab8 Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var. 2013-08-07 08:01:59 -07:00
Justin Clark-Casey (justincc)
b8612e005a At OpenSimulator startup, print out default min built-in threadpool threads as well as max. 
Make it clear that we only try to adjust max, and log at warn level if this fails.
Other minor logging cleanup.
 2013-08-05 20:47:47 +01:00
Dan Lake
6572847518 Added MinPoolThreads to ini [Startup] section to control SmartThreadPool. 2013-07-18 02:28:07 -07:00
Dan Lake
f64f07e7c5 command line kick user now uses exact name match instead of substring search to avoid kicking the wrong user or multiple wrong users. 2013-07-17 15:05:30 -07:00
Justin Clark-Casey (justincc)
e19defde36 Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap 
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
 2013-07-08 22:03:07 +01:00
Justin Clark-Casey (justincc)
5dbdd5f8b4 refactor: Make stats and sim status simpler by extending BaseStreamHandler like other handlers instead of implementing the IStreamedRequestHandler interface directly 2013-07-06 00:12:48 +01:00
Justin Clark-Casey (justincc)
25889b2d7e change "debug packet" command to "debug lludp packet" to conform with other "debug lludp" options 
also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs
gets all debug lludp commands to only activate for the set scene if not root
 2013-07-04 00:02:53 +01:00
Justin Clark-Casey (justincc)
0d2fd0d914 Make general server stats available on the robust console as well as the simulator console 
This means the "show stats" command is now active on the robust console.
 2013-06-17 22:39:00 +01:00
Justin Clark-Casey (justincc)
304c5d4a8b On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created. 
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
 2013-05-03 18:48:50 +01:00
Justin Clark-Casey (justincc)
c5de9840b0 refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop(). 
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
 2013-04-16 21:58:24 +01:00
Justin Clark-Casey (justincc)
12900ea84e Log same environment information to Robust log as is already done for simulator logs, for debug purposes 2013-03-14 23:39:15 +00:00
Justin Clark-Casey (justincc)
faf96f5c85 minor: Log location in which simulator/robust was started. 
Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
 2013-02-28 23:59:26 +00:00
Justin Clark-Casey (justincc)
0e8ec5649e Get "show modules" console command to obey selected command line region/s 2013-02-27 22:32:14 +00:00
Justin Clark-Casey (justincc)
647cb278c7 Get "show modules" console command to show modules in alphabetical order, and group shared and non-shared modules together 
This is to make it easier to tell if a region has a certain module active or not
 2013-02-27 22:25:03 +00:00
Allen Kerensky
7524bd5a7c Additional ThreadPool worker and IOCP thread startup logic 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2013-02-10 14:14:33 -05:00
Justin Clark-Casey (justincc)
145e38e5e9 Remove long unused Scene.DumpAssetsToFile boolean. 2013-02-06 02:21:17 +00:00
teravus
6b0310b829 Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene. 2013-02-03 08:13:52 -05:00