254b26a7d5
fix merge
2017-01-05 19:32:57 +00:00
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
2a01173715
Merge branch 'master' into httptests
2016-12-30 01:52:02 +00:00
aee3f273f0
Serving robots.txt from bin Idea of solution for http://opensimulator.org/mantis/view.php?id=7392
...
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2016-12-29 22:32:08 +00:00
86cc02f33e
Merge branch 'master' into httptests
2016-12-23 02:53:58 +00:00
90be8d78c3
Remove obsolete config option "EventQueue". It's been always on for ages!
2016-12-20 17:10:33 +00:00
66c18438f2
remove obsolete config option "storage_prim_inventories"
2016-12-20 17:08:15 +00:00
18a292ad02
Merge branch 'master' into httptests
2016-12-14 13:35:53 +00:00
cdfdf6322d
Applying a modified version of TomTheDragon's patch to prevent the sim
...
from crashing when signals are unavailable.
2016-12-12 09:26:12 +00:00
da2c1e8aad
don't do unix signals on windows
2016-12-12 00:54:41 +00:00
4d1536f1ec
Allow OpenSim to respond to Unix signals. This may need work to be
...
properly ignoed on Windows.
Windows devs, please test and check for platform flags if this causes
issues in Windows
2016-12-12 00:07:36 +00:00
806e75eefb
remove not needed sslport parameter
2016-12-08 23:39:55 +00:00
877d3092b4
Merge branch 'master' into httptests
2016-11-27 15:14:34 +00:00
d2bbd7ef2b
Fix in cmdparams.Length for: SavePrimsXml2 and SaveXml
...
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-11-26 04:14:32 +00:00
1e90417ac2
Fix in descriptions of: load xml, load xml2, save xml, save xml2
...
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-11-26 04:11:31 +00:00
80d4f76d18
keep a unsecure http port up for external services (datasnapshot search). Only fire poolservices on main http listener
2016-10-09 20:18:20 +01:00
5b946405a0
changes to regions ssl suport: verify if hostnames are validate by the selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later)
2016-10-09 01:01:52 +01:00
b51739e23e
recover regions main http server ssl suport. Using a PKCS12 cert file, and not certs store for now. Option http_listener_cn, cert CN need to the same as external IP. Self sign certs do seem to work, but the viewers option NoVerifySLLCert needs to be set true. CA check is not done but they do check the IP
2016-10-06 21:35:11 +01:00
01289b9c2d
first step removing MegaRegions: refuse to run. Thanks to all that made MegaRegions possible, they where a important OpenSim feature, but can no longer be mantained
2016-07-27 23:13:24 +01:00
ab12a14279
Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.
2016-02-21 11:14:02 -08:00
0b216c37df
Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:48 +00:00
59b63b6406
On to 0.8.3!
...
Conflicts:
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
339f60e990
more on compile..
2015-09-08 18:45:53 +01:00
e5367d822b
Merge of ubitworkvarnew with opensim/master as of 20150905.
...
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
d00f73c3a4
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
2015-09-04 14:39:23 -07:00
9d7e310e21
Deleted commented code
2015-09-04 09:40:21 -07:00
dac8edd5dd
Transformed the LLUDP ad-hoc plugin into a region module. It works.
2015-09-03 15:59:06 -07:00
7bfa311e32
fix a old bug i added: MaxWearables can't be changed in runtime
2015-09-03 20:51:30 +01:00
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
11194209df
First commit where physics work as region module.
...
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
2015-08-31 14:09:15 -07:00
ce2c67876e
More namespace and dll name changes. Still no functional changes.
2015-08-30 21:05:36 -07:00
2c0cad6dd3
Renamed the namespaces too
2015-08-30 20:29:31 -07:00
5648eb7bd1
Moved instantiation of SceneCommunicationService object to inside the scene constructor. This was a left over from the original monolithic design of scene communications. The less the instantiators of scenes know about the scene's internals, the better.
2015-08-30 15:52:26 -07:00
3829df1059
try to implement core load oar options
2015-08-24 17:05:16 +01:00
0af2fafddf
add missing regionExtent setup and Scene physicsscene configuration ( not
...
exactly as core)
2015-08-19 11:04:28 +01:00
0c5facbd75
Typo Fix
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-05 16:48:16 -07:00
da32512ea4
Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*")
2015-04-29 18:47:17 -07:00
45dd0cc363
Actually start a region created via the "create region" console command.
...
Addresses http://opensimulator.org/mantis/view.php?id=7478
2015-03-13 23:50:00 +00:00
78258a0fa1
help restart message corrected
...
The "restart" console command restarts the currently selected region or
all regions in this instance if root is selected. Changed the message
accordingly.
2015-03-11 23:30:05 +00:00
b5ac2eb1e1
Allow setting the size of the wearables array from config, for core compatibility
2015-03-10 01:04:04 +01:00
b379eaa169
Remove the extra key expansion added in commit a88bc50a16. It's not needed.
2015-01-03 07:56:00 -08:00
3375841fee
Capitalization fail.
2014-12-30 23:47:11 -08:00
a88bc50a16
Add support for expansion of key values in nini config files.
...
Add loading of 3rd-party addin inis automatically.
2014-12-30 20:05:12 -08:00
2138d5c7f8
Renamed VERSION_NUMBER to VersionNumber
2014-12-30 15:27:28 -08:00
7466ef0525
This cleans up versioning. Specifically:
...
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
2014-12-30 12:53:31 -08:00
5cf6a6f830
WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
...
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
2014-12-30 07:58:42 -08:00
601849b4fa
Added AssemblyInfo.cs to OpenSim.exe
2014-12-29 14:13:17 -08:00
86367d7219
refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class.
...
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
2014-11-25 23:56:32 +00:00
b1fd0d35e5
Make small adjustment to JobEngine default from previous commit to enable it when [Startup] section is not present (though this is extremely unlikely).
2014-11-25 23:23:11 +00:00
59b38f842a
Add [Startup] JobEngineEnabled setting that allows the job engine to be disabled for testing purposes if necessary.
2014-11-25 23:23:11 +00:00
281969093f
Start JobEngine by default in simulator for now.
2014-11-25 23:21:38 +00:00
a301bad8ad
on util thread pool reduce the min number of threads, increase the
...
maximum and increase the idle time before release to OS
2014-10-13 12:10:13 +01:00
5db3f08871
minor: add --default-user option to "load oar" help long description. Do other small tidies of "load oar" console command help.
2014-10-11 00:03:05 +01:00
c7a11899f6
Give ability to define constants that may be used throught the configuration
2014-10-09 14:59:54 -04:00
bde60cc92e
Add persistent command history in console
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
f254761649
turn off Nangle on users of ServivePointManager like webrequests
2014-09-17 14:47:36 +01:00
538a95ff1e
in show connections show also if it is a childagent connection
2014-08-14 21:05:17 +01:00
8c657e4837
add a estimator of client ping time, and painfully make it visible in show
...
connections console command
2014-08-14 20:41:36 +01:00
36f01dce2d
Change MaxPoolThreads default in code as well from 15 to 300
2014-08-08 23:47:03 +01:00
3654ae8d8c
Allow the "debug scene set physics false|true" command to work when bulletsim physics is running in a separate thread.
...
This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
2014-07-29 01:21:15 +01:00
fea18a909f
Fix bug in "show modules" comamnd that was showing shared modules as non-shared and non-shared as shared
2014-07-09 23:24:12 +01:00
b019fd5a95
Show region size column in simulator version of "show regions" console command
2014-07-05 00:20:39 +01:00
889194db63
Actually call Close() for shared region modules when the simulator is being shutdown.
...
Adds regression test for this case.
2014-07-02 23:49:25 +01:00
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
78015bbbdc
Console commands for Estate Mgmt
2014-05-06 18:55:42 +01:00
8b3c2f7d0c
updated version of default user switch for load oar :q :q
2014-05-06 18:48:42 +01:00
a108fcac95
Restore overload mode accidentally disabled in a prior commit. Add a new
...
config option, LogOverloads, to log when a thread pool overload occurs.
This option defaults to "True" because the logging data is useful for
diagnosing threading issues.
2014-04-25 21:34:29 +01:00
4aa483777b
Move new Estate commands to OpenSim.cs
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 12:45:43 -04:00
921f0052f4
Get the full viewer name even if it's (incorrectly) sent in the 'Channel' field
...
Recent versions of Firestorm and Singularity have started sending the viewer name in the 'Channel' field, leaving only their version number in the 'Viewer' field. So we need to search both of these fields for the viewer name.
This resolves http://opensimulator.org/mantis/view.php?id=6952
2014-03-24 12:26:52 +01:00
a4d322dcd1
Allow the setting from the environment to take effect if no explicit setting is given.
...
This is done by calling the constructor only with a directory if one is actually given.
2014-03-22 01:47:48 +00:00
3d0778bcd6
Allow Mono Plugin Registry setting for Regions
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-03-22 01:29:51 +00:00
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
6955190c7d
Add Util method to load OpSys env vars
2014-02-26 23:39:45 +00:00
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
41b6602a77
Add "--no-objects" parameter to 'load oar'.
2014-02-02 22:16:01 -08:00
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
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
8eec717f5f
Merge branch 'master' into varregion
2014-01-28 08:50:28 -08:00
f7172095e0
Convert tabs to spaces from previous commit 8c2b41b01
2014-01-28 00:04:55 +00:00
8c2b41b01d
Make inidirectory files supercede distro files
2014-01-27 23:56:10 +00:00
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
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
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
31279a3308
Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster
2014-01-05 20:03:48 +00:00
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
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
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
6d6b9ab791
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
31bacfbb63
Merge branch 'master' into varregion
2013-12-01 15:51:42 -08:00
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
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
3193bcaae1
Merge branch 'master' into varregion
2013-11-24 07:23:12 -08:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
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
604b39cea9
Merge branch 'master' into varregion
2013-11-15 14:56:13 -08:00
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
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
c931b16c1f
Merge branch 'master' into varregion
2013-11-04 22:12:57 -08:00
UbitUmarov