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
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +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
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
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
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
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
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01: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
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
4aadfc3007
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:27:56 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
220f82a0f0
Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/)
...
Also convert some tabs into spaces.
2010-09-11 00:27:52 +01:00
b8c58e5f9f
reinsert functionality to debug log more levels of incoming and outgoing client protocol packets
...
These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets)
This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
2010-08-31 18:27:10 +01:00
3cd7761d65
Report exception message as well as stack trace if a region fails to register with the grid service in grid mode
2010-08-30 21:23:19 +01:00
7aad5af498
Some code cleanup for console command "create region".
...
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
ae43a07f3b
Configuration files can read include files from relative paths.
2010-08-13 23:59:30 +01:00
8eeb3f2fd2
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
2010-08-13 23:29:01 +01:00
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
251be8a1be
Prettify console output for long avatar names.
2010-08-11 20:22:01 -07:00
09ab32c21e
Remove StandAlone from default hardcoded config
2010-08-04 03:10:10 +01:00
2c4df19805
minor: Move log information about SYSTEMIP to the place where it's resolved
2010-06-25 18:29:02 +01:00
5a071dc798
Move loading of parcels to before script start. Scripts using parcel functions
...
can fail if no land is loaded
2010-06-24 03:24:38 +01:00
b1298fca0a
tidy up help information on load oar and save oar
2010-05-28 19:36:30 +01:00
d4192dcb2e
* Revert last commit for now at Melanie_T's request.
...
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
dc1a3e9787
* Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files.
2010-05-15 23:21:36 -04:00
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
bf3956aeb0
Add --skip-assets option to load oar.
...
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
b51f40da8f
Removed the unused use_async_when_possible config variable
2010-03-16 12:03:04 -07:00
e39fc95659
Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
...
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
e07548d703
move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
2010-03-04 20:08:25 +00:00
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
842b68eeff
Change handling of the SYSTEMIP constant to be more sane.
...
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
42f978a478
* HGScene is no more.
...
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
c211a120a5
Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
f1c30784ac
* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.
...
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
2010-01-15 15:11:58 -08:00
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
4e7c449c5a
This fixes the problem that region modules (new style) weren't being recognized.
2010-01-11 14:39:15 -08:00
19ad68e5e4
Moved MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); around, because it was crashing. Now it crashes elsewhere.
2010-01-11 08:11:04 -08:00
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
001d369568
CommunicationsManager deleted.
2010-01-11 07:45:47 -08:00
ff55ae0eb2
Make console_port work.
2010-01-11 07:59:13 +00:00
bfddd75ca8
Refactor. Instantiate sim status handlers in opensim base, not in a plugin
2010-01-11 05:12:01 +00:00
dc4bbf6065
All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService.
2010-01-10 20:29:09 -08:00
e966e51b89
Add a console_port setting to let the rest console use a different port
...
from the region server
2010-01-11 03:29:24 +00:00
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -08:00
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
7cb66de2e0
* Moved command reset password from OpenSim to UserAccountService.
2010-01-09 18:16:14 -08:00
96ecdcf9c5
* Added SetPassword to IAuthenticationService.
...
* Added create user command to UserAccountService. Works.
* Deleted create user command from OpenSim.
2010-01-09 18:04:50 -08:00
e987e85c0c
add agent position to output of "show users" console command
2009-11-30 01:09:03 -08:00
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
88ead9ee63
pass all command parameters to load/save oar, not just the filename
...
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
c17359fea5
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
bff0d75e0f
patch kill by UUID
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-10-28 18:09:50 +00:00
0b1726b524
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 16:48:43 -07:00
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
2f394b7e7e
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)
...
* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 01:30:12 -07:00
b35fbe1f98
Merge branch 'melanie_test' into prioritization
...
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
2009-10-22 07:02:21 +01:00
32ccd5bb40
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget()
...
* Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-21 23:03:18 -07:00
8ce4fd7234
Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2
2009-10-22 04:02:26 +01:00
8a336c6860
Add MaxPoolThreads in startup to limit the size of the thread pool used
...
for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 02:28:53 +01:00
26863c04a5
Change "config save" to "config save <filename>", which is mandatory.
...
File name is enforced to NOT be OpenSim.ini
2009-10-20 14:02:11 +01:00
1e9e9df0b3
* Switched to a plain lock for the ClientManager collections and protected the TryGetValues with try/catch instead of a lock
...
* Added ClientManager.ForEachSync() for operations that need to run synchronously, such as "show connections"
2009-10-14 14:25:58 -07:00
25878d6828
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 13:00:42 -07:00
527c94825b
Merge branch 'master' into htb-throttle
2009-10-09 17:23:18 +01:00
b6678faf34
* Apply http://opensimulator.org/mantis/view.php?id=3933
...
* Remove client servers when regions are closed or removed
* Thanks randomhuman!
2009-10-09 17:28:16 +01:00
494a1e922d
Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet
2009-10-09 02:10:53 -07:00
7199976d48
Checks the number of ThreadPool and IOCP threads on startup and bumps up the numbers to .NET defaults of 500/1000 if need be
2009-10-06 15:51:56 -07:00
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
29a4614529
* MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData
...
* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)
2009-10-04 13:57:51 -07:00
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
67fefdb5a0
Remove predecode-j2k and it's assoaciated logic
2009-09-30 21:33:00 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
94aa7e677c
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 09:12:43 +01:00
f4bf581b96
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
...
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
902279f0fd
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 08:39:09 -07:00
077d01c225
switch default physics engine to ODE and default meshmerizer to Meshmerizer in code and in OpenSim.ini.example
2009-09-16 18:44:55 +01:00
496b368334
Add a using() block around the timer script
2009-09-11 21:52:49 +01:00
5bf288745d
De-hardcode default home locations on create user (standalone).
2009-09-09 11:02:31 -07:00
0d7bcee560
no-op to poke panda
2009-08-17 20:25:14 +01:00
3d7bb7567c
Add the ability to use -console=rest to the region server. User
...
and pass are specified the same way as for the ROBUST server
2009-08-17 09:21:39 +01:00
b47e405420
* minor: Comments
2009-08-12 22:54:57 -04:00
5d2a157e64
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
2009-08-10 10:48:21 -07:00
0d8284c7a1
Removed IAssetCache.
...
WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 08:14:57 -07:00
257ed4c4ac
Remove debugging output frm ini file loading. Make it collect matching
...
files only from last path component.
2009-08-07 23:05:16 +01:00
a1a09297bc
Silly error, simple fix
2009-08-07 22:40:58 +01:00
e1427b4c3f
Try another way to canonicalize the path that may work in Windoze
2009-08-07 22:37:41 +01:00
d10f157183
Remove GetFullPath call from config includes, because it barfs in Windoze
2009-08-07 20:51:07 +01:00
2148f84e1e
Temporailiy add some info output in config load
2009-08-07 20:18:04 +01:00
cb10700a1f
Make the opensim.ini logfile option really work (port of a fix from ROBUST)
2009-08-07 14:15:59 +01:00
efc57bc3d7
Allow arbitrary wildcards in config includes. Things like
...
Include-Modules = "addin-modules/*/config/*.ini" will now work.
Adds Util.Glob, which will resolve a globbed path into a string list.
2009-08-06 02:29:12 +01:00
cabda86615
Patch from Kai Ludwig: Fix prim drawing on maptile.
2009-07-29 16:32:56 +00:00
169a353cca
* minor ccc
2009-07-24 06:59:27 +00:00
78d7f4696e
Now we are past revision 10000, I think its time to start to fix that massive bug that was introduced in revision 1. So here is the first part of that fix.
2009-07-10 11:03:38 +00:00
c310fb11f4
Remove all references to HttpServer from CommsManager (all incarnations)
...
Change all uses of the HttpServer properties to use the new singleton
2009-07-10 02:22:26 +00:00
525ab2c278
Thank you kindly, RandomHuman for a patch that:
...
The admin_close_region method removes a region from the simulator without deleting it.
The region can then be recreated by calling admin_create_region with the same UUID.
There is also a change to admin_create_region to facilitate this.The reason I want
to have this functionality is to make it possible to detach regions when they are
idle and recreate them on demand through a web interface. It's probably doable
using the existing methods by saving and loading oars, but it also doesn't seem
like that should be necessary.
2009-07-08 20:53:22 +00:00
5869598c4c
Make delete-region delete the section from an ini file. Will delete the whole
...
file if it has no sections left.
2009-06-26 00:00:20 +00:00
7cc69ac97f
Make create region save the new region to ini file format if the name
...
specifies an ini file.
If the ini file exists, the region will be added.
2009-06-25 23:31:55 +00:00
a23d64dec1
Formatting cleanup.
2009-06-10 04:28:56 +00:00
bfea077508
* Add oar saving timeout
...
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds
* Timeout executes abort, since missing assets in an OAR seems bad
* This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service
* This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
2009-06-05 13:48:43 +00:00
23bf1bf6e0
Thank you kindly, MattSetzer, for a patch that solves a Mantis:
...
This appears to be due to the fact that no asset cache has been
configured, possibly as a result of the configuration changes that
have been made recently. I've attached a patch to display a message
to that effect rather than throwing an error.
2009-06-02 21:13:29 +00:00
c6f616049c
Only save crashes to disk if save_crashes in OpenSim.ini is true (false by default).
2009-06-01 18:45:36 +00:00
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
c061b4cb49
Changed the order of things in Scene creation. This piece of code is very jibbery, widely different results with slightly different orders. This particular order produces the best results in the UC Irvine sim in osgrid. But clearly there's something messed up here.
...
Addresses mantis #3707 , mantis #3713 , mantis #3686 .
2009-05-26 16:45:30 +00:00
8f8e20b39d
Small update to make the command line work again
2009-05-21 23:07:26 +00:00
e5f3337c3f
Implement .ini file includes. Anything that begins with "Include-" will be
...
treated as another ini source to load.
For example:
Include-Asset = AssetSetup.ini
will load AssetSetup.ini after all other ini files are done.
This works recursively, too
2009-05-21 23:06:10 +00:00
4065ebff15
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
4c7da1421f
refactoring instantiation of Location object: moving it out of the for
...
loop as it really is a "constant"
2009-05-20 13:37:25 +00:00
cd90ea377e
* minor: Tweak the command exception catcher of last resort to make a little more sense
2009-05-19 19:57:45 +00:00
23d902be42
Remove the old asset cache and local services and the configurations for them
2009-05-18 23:18:04 +00:00
1cc9d1fd8d
* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191
...
* didn't realize that we were getting back plain old exceptions
2009-05-18 18:44:55 +00:00
29671fc103
* Resolve http://opensimulator.org/mantis/view.php?id=3191
...
* Catch directory exception on load oar as well as file exception
2009-05-18 18:22:15 +00:00
5e4fc6e91e
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
...
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
2009-05-15 05:00:25 +00:00
a5feb0682a
Thank you kindly, BlueWall sir, for a patch that:
...
Adding a jsonp wrapper to the user supplied status report
uri if the key "callback" exists. It will work with many
javascript toolkits to provide an ajax callback to allow
the browser to update stats reports without the
intervention of an intermediate server.
2009-05-13 01:27:23 +00:00
e08d0a7ba5
Thank you kindly, Patnad, for a patch that:
...
This patch allow you to see region rating from
the console. Type "show ratings" and it will
show you the rating of all your regions.
2009-05-12 03:35:07 +00:00
c1e7352d75
Add the asset service connectors and sample config. READ WARNINGS!!!
2009-05-09 02:49:55 +00:00
acfb5051cd
Intermediate commit. WILL NOT COMPILE!
2009-05-04 20:15:39 +00:00
1b877234da
Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple
...
console capable of processing commands. Create LocalConsole as a console
that uses cursor control and context help. Precursor to a distributed
console system for the new grid services. No functional change intended :)
2009-05-04 12:15:55 +00:00
280d2cbf4a
Thank you kindly, BlueWall, for a patch that:
...
Move json stats to non-published resource name
Remove well-known resource name for json stats,
creating dynamic uris with private keys and add
a user configurable resource name for region owner usage.
2009-05-02 16:28:30 +00:00
af73bcd363
* Actually change the default oar file name to region.oar instead of scene.oar, for clarity
2009-04-29 18:12:50 +00:00
23aa85b75d
* Make scene.oar the default oar target rather than scene.oar.tar.gz, in an attempt to reduce confusion
2009-04-29 18:03:31 +00:00
d8313e314f
Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527 .
2009-04-27 00:16:59 +00:00
4792e6139a
Thanks Bluewall for Mantis #3519 : a patch that adds simulator uptime and version to REST/json statistics reporting
2009-04-25 05:06:01 +00:00
6aa5d3904d
Add copyright headers. Formatting cleanup.
2009-04-22 00:48:56 +00:00
b4cb45bb79
Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
...
This patch adds extended status reporting with the url
http://server:port/simstatusx/ [^] . The data is returned
in json format as "text/plain" type.
2009-04-17 21:48:48 +00:00
83c9a6a230
* Change profile check for add user to run through the cache service
2009-04-17 16:06:35 +00:00
a189da844a
* Moved the DefaultConfig settings into already-existing ConfigSettings
2009-04-17 15:09:37 +00:00
96a22862d2
adding log statement on shutdown in background mode
2009-04-17 13:27:32 +00:00
bbe1e19696
* Some more work on refactoring configs;
...
* Moved the constants out into a separate DefaultConfig
* Pulled configMember up
* Some minor CCC
2009-04-17 05:52:46 +00:00
bd2ca2d9c1
- turn private m_gui into protected m_gui to allow manipulation in
...
derived classes
- make OpenSimBackground inherit from OpenSim instead of OpenSimBase
so that it will have a MainConsole instance and we can use console
commands, setting m_gui to false
2009-04-16 12:10:50 +00:00
1894157dd3
* Explicitly start the asset server thread so that unit tests can run single rather than multi-threaded (which may be behind the occasional test freezes)
2009-04-14 17:15:09 +00:00
ad2bd74057
* refactor: rename AssetCache.Initialize() to AssetCache.Reset() to avoid having Initialise() and Initialize() in the same class - very difficult to read.
2009-04-14 16:36:32 +00:00
648452dd91
- Add new RegionModulesControllerPlugin to the application modules
...
- Change several classes to use the new plugin for handling of region-modules
(NOTE: No regionmodule is using this yet)
- Add necessary prebuild parts (don't forget to runprebuild)
Attention: Work in progress. This shouldn't break anything, but you never know...
2009-04-05 17:08:11 +00:00
4e8723ad3f
Directory defaults for region xml files when creating a new region got changed/lost with svn 8550 when a check was added for the file name having .xml extension. The extension check has been moved slightly earlier and the original directory logic restored.
...
Fixes Mantis #3386
2009-04-05 10:31:18 +00:00
7f4bf5871d
* Proactively fixed bug-potential concerning the fact that m_httpServer property was differently referred to between RegionApplicationBase and all other grid services.
2009-04-03 20:56:36 +00:00
fc1b1bc797
- adding -logconfig option to allow configuration of log4net from
...
log4net config file other then bin/OpenSim.exe.config
- moving ArgvConfigSource initialization up to allow for configuration
of XmlConfigurator.Configure()
2009-04-03 12:47:56 +00:00
76ca096384
Add a PIDFile in [Startup], which the PID will be written to
2009-04-01 12:13:42 +00:00
f7eac63e01
Another bit of refactoring to try to make sense of OpenSim.Framework.Communications. Everything that looks like a service, with service handlers, moved to .Services -- i.e. LoginService and Response, and GridInfoService. The rest of the changes were to adapt to the new locations of those files.
2009-03-29 22:04:45 +00:00
10d21afd9d
* Apply http://opensimulator.org/mantis/view.php?id=3343
...
* Removes long unused -useexecutepath switch
* Thanks coyled
2009-03-26 17:43:05 +00:00
e694e1a657
* minor: Adjust exception catching on load/save xml[2]/oar.
...
* Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
2009-03-25 19:21:28 +00:00
19595a2825
* minor: spit out creator name on save iar
...
* not yet ready for use
2009-03-25 19:14:36 +00:00
09d2c6fe5d
adding presence.ControllingClient.Kick(msg) to the brew.
2009-03-25 18:48:30 +00:00
0419f29856
enhances the console command "kick user" with an optional alert
...
message which will be dialog-ed to the user just before being kicked.
2009-03-25 18:04:33 +00:00
5e9682cef7
* Fix edit scale command - was looking for one too few arguments
2009-03-24 19:04:28 +00:00
8f1844665b
* Group OpenSim.Framework.Servers interfaces together
2009-03-19 19:21:17 +00:00
a7d610ffcc
Adds support for unlink-region command in hypergrid.
2009-03-18 16:37:26 +00:00
acad0328b2
* Make all coded defaults match settings in OpenSim.ini.example
...
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using
* OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
2009-03-11 18:02:22 +00:00
669aa46bff
update some ini defaults in code - all defaults from beginning of OpenSim.ini.example thru DefaultScriptEngine = "XEngine"
2009-03-11 09:31:02 +00:00
91a096dca6
* Cleanup and CCC (Code Convention Conformance)
2009-03-10 20:27:41 +00:00
fc2c73d5c6
* minor: remove some mono compiler warnings
2009-03-06 21:00:15 +00:00
f18400fcfb
* For now, restore file extension for default oar name I accidentally removed on the last commit
2009-03-04 20:36:09 +00:00
b52ac542ad
* Add the abilty to load and save iar item nodes where folders have identical names
2009-03-04 20:31:03 +00:00
76133d0763
Refactoring of CreateCommsManagerPlugin.
...
Plus some general cleanup of a few other files (deleting excess blank lines etc)
2009-03-03 12:51:54 +00:00
8ebd5b409a
Renamed OpenSimBase m_autoCreateLindenStack to m_autoCreateClientStack
2009-03-02 18:04:00 +00:00
3c46ee9326
Moved the SetupScene methods from RegionApplicationBase to OpenSimBase [Do we really still need RegionApplicationBase?]
...
Added a flag (bool m_autoCreateLindenStack = true) which says if the ClientStack will be autocreated and initialised when creating regions. This helps with moving ClientStacks to Region modules.
Currently this flag is hardcoded to true, as it is only for testing at the moment, so you need to change the value in the code if you want to turn off auto creating.
2009-03-02 16:33:11 +00:00
1dcbea0144
Removed the commented out InitialiseStandaloneServices and InitialiseGridServices (which are now preformed in CreateCommsManagerPlugin) methods from OpenSimBase and HGOpenSimNode. As if we decided to swap back to the old methods we can always re-add them, rather than leave them commented out.
2009-03-02 11:21:18 +00:00
7a2985b441
Changed it so only .ini file types are loaded from the (optional) config directory rather all files types in that folder.
2009-02-28 15:16:12 +00:00
b83d5c7cdb
Added support for reading ini files from a (optional) config folder. This allows the spliting up of opensim.ini into multiple ini files.
...
The ini files in this folder are loaded after the masterini file (if that is set) and before opensim.ini.
The default folder it looks for and searches is "bin\config", but that can be set by using the command arg "-inidirectory=<path>" (path is local to bin\) when starting up opensim.exe.
2009-02-27 14:17:57 +00:00
756c517069
Added IRegionCreator interface that all ApplicationPlugins that are creators of Scenes should implement and register with the ApplicationRegistry.StackModuleInterface<>(); So that other plugins can attach to their OnNewRegionCreated event.
...
Made some changes to IRegistryCore and RegistryCore so they support "Stacked" interfaces.
2009-02-26 22:51:52 +00:00
e2d30a0244
Moved the Initialisation of the CommunicationsManager to a ApplicationPlugin.
...
Also in that plugin it registers the IUserService with all the Scenes (as they are created). So now we can start changing over all uses of IUserService, that currently access it from the CommunicationsManager to accessing it from the Scene.RequestModuleInterface call.
Once that is done we can move the UserService creation out to its own plugin and remove all references to it from the CommunicationsManager. Then we can take the next CommunicationsManager interface and repeat.
2009-02-26 21:30:12 +00:00
7b04d1da5e
* Apply http://opensimulator.org/mantis/view.php?id=3191
...
* Make load/save oar and load/save xml2 behave a little better when there is an io problem
* Thanks dslake
2009-02-26 21:00:33 +00:00
18382ebfd9
Changed the type of the ApplicationRegistry member from RegistryCore to IRegistryCore
2009-02-26 20:11:13 +00:00
33e7c09b7b
Added IRegistryCore and RegistryCore to OpenSim.Framework.
...
Added a ApplicationRegistry to OpenSimBase.
Changed LoadRegionsPlugin so it registers itself to that application registry.
Added a event to LoadRegionsPlugin, that is triggered when it creates a new scene ,although maybe this event should actually be in opensimBase incase other plugins are creating regions (like the RemoteAdminPlugin).
2009-02-26 20:01:20 +00:00
c0c1a31f61
Attempt to fix the "region starts but doesn't load anything" issue
2009-02-26 17:06:06 +00:00
de82bf9eb5
Added a PostInitialise method to IApplicationPlugin, this allows us to do work in there knowing that all other ApplicationPlugins have been initialised by that time.
...
Moved the loadRegions code in LoadRegionsPlugin to the PostInitialise method.
2009-02-26 15:21:06 +00:00
6c8debd3e0
From: Alan Webb <awebb@linux.vnet.ibm.com>
...
The mono addin filter for the AssetCache is incorrect, this fixes it.
The problem only shows up when you have more than one AssetCache to
choose from.
2009-02-25 14:19:15 +00:00
bdf95e54a2
A few updates necessary for load balancer.
...
- handle GetUser request for nonexistent user gracefully
- include throttle levels in ClientInfo
- code to save/restore throttles in client stack
- only update/send updates to active clients
- make animation classes serializable
2009-02-25 00:32:26 +00:00
ea26bd4153
First step in separating out the Userserver console command handling to a "module".
...
Added OpenSim.Grid.UserServer.Modules project/dll which now contains the components of the userserver. With the OpenSim.Grid.UserServer being the setup and initiate exe.
2009-02-24 15:37:03 +00:00
e9e5c175cd
Thank you kindly, TLaukkan (Tommil) for a patch that solves:
...
If -background=true is specified on the command line, a null pointer exception crashes the server in OpenSim/Region/Application/OpenSimBase.cs in method StartupSpecific. Its trying to dereference m_console which is null, presumably because we're in background mode.
2009-02-23 23:14:04 +00:00
8f55b9d735
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
...
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
2009-02-22 20:52:55 +00:00
551bebdc84
Update svn properties, add copyright headers, minor formatting cleanup.
2009-02-22 01:18:49 +00:00
a2546d58a8
Applied patch from mantis #3213 . Which adds a check to create region command, to make sure the .xml is passed in the command arguments. Thanks BlueWall
2009-02-21 14:45:10 +00:00
33330297d6
THE BIG ANTI-REMOTING SCHLEP -- StartRemoting is no more. Sims in older versions will have a hard time communicating with sims on this release and later, especially if they haven't transitioned to RESTComms at all.
...
There's still some cleanup to do on assorted data structures, but the main functional change here is that sims no longer listen on remoting ports.
2009-02-20 03:39:50 +00:00
Justin Clark-Casey (justincc)