Commit Graph

641 Commits

Author SHA1 Message Date
MW
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
MW
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
MW
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
MW
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
MW
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
MW
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
Justin Clarke Casey
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
MW
18382ebfd9 Changed the type of the ApplicationRegistry member from RegistryCore to IRegistryCore 2009-02-26 20:11:13 +00:00
MW
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
Sean Dague
c0c1a31f61 Attempt to fix the "region starts but doesn't load anything" issue 2009-02-26 17:06:06 +00:00
MW
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
Sean Dague
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
Mike Mazur
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
MW
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
Charles Krinke
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
Charles Krinke
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
Jeff Ames
551bebdc84 Update svn properties, add copyright headers, minor formatting cleanup. 2009-02-22 01:18:49 +00:00
MW
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
diva
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
Jeff Ames
7d4846462b Update svn properties, add copyright headers, minor formatting cleanup. 2009-02-20 02:33:54 +00:00
diva
1fa8a7ce29 Restoring method 2 of linking regions in HG, which was commented out for some bizarre reason. Fixes mantis #3141. Thanks Vinc for providing an alternative patch, which wasn't used but served to expose the mix-up. 2009-02-18 16:11:34 +00:00
Sean Dague
8ed631307b From: Alan Webb <awebb@linux.vnet.ibm.com>
I've changed the extension point name, and the internal references that
used the same string. I also fixed up the messaging around the asset
loader so that it is more explicit.
2009-02-18 13:15:07 +00:00
diva
3f25128e77 Adds support for preserving animations on region crossings and TPs.
Known issue: after TP, the self client doesn't see the animations going, but others can see them. So there's a bug there (TPs only, crossings seem to be all fine).
Untested: did not test animation overriders; only tested playing animations from the viewer.
2009-02-18 01:49:18 +00:00
Justin Clarke Casey
af57937760 * Apply http://opensimulator.org/mantis/view.php?id=3068
* This enables parsing of xml files and files obtained via http for the -inimaster option as well as -inifile
* Thanks StrawberryFride!
2009-02-17 17:12:10 +00:00
Justin Clarke Casey
93837807ff * refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
2009-02-16 19:15:16 +00:00
Sean Dague
f4bec00057 From: Alan Webb <awebb@linux.vnet.ibm.com>
The change makes two principal implementation changes:

[1] It removes the hard coded set of possible asset server client
implementations, allowing any arbitrary implementation that has been
identified to the PluginLoader as an appropriate extension. The
extension point for asset server client extension
is /OpenSim/AssetServerClient. All of the old configuration rules have
been preserved, and any of the legacy configuration values will still
work as they did before, except the implementation is now loaded as a
plug-in, rather than as a hard-coded instantiation of a specific class.
The re-hashing of IAssetServer as an extension of IPlugin made upgrading
of the implementation classes a necessity.

Caveat: I have not been able to meaningfully test the crypto-grid
clients. I believe they should work correctly, but the refactoring
necessary to handle plug-in based initialization (vs constructor-based
initialisation) admits the possibility of a problem.

[2] The asset cache implementation, previously introduce as a hard-code
class instantiation is now implemented as an IPlugin. Once again the
previous (configurationless) behavior has been preserved. But now it is
possible for those interested in experimenting with cache technologies
to do so simply by introducing a new extension for the asset cache
extension point (/OpenSim/AssetCache).

I've tested all of the configuration settings, after applying the patch
to a newly extracted tree, and they seem to work OK.
2009-02-16 12:20:31 +00:00
Justin Clarke Casey
bc9a013f52 * minor: remove mono compiler warnings 2009-02-13 20:51:22 +00:00
Melanie Thielker
a8f3d625cb Guard the values used to set the cursor position in the real time console 2009-02-13 20:49:23 +00:00
Justin Clarke Casey
d307109e1a * refactor: move alert commands from Scene to DialogModule 2009-02-13 19:03:18 +00:00
Justin Clarke Casey
88b273bc71 * refactor: Move export map function to world map module from scene 2009-02-13 16:43:20 +00:00
Jeff Ames
95d53d48d4 Add copyright headers. Minor formatting cleanup. Fix some compiler warnings. Fix some m_log declarations. 2009-02-13 02:06:28 +00:00
lbsa71
801da4346a * optimized usings. 2009-02-12 09:53:12 +00:00
Justin Clarke Casey
83105211bc * minor: remove some mono compiler warnings 2009-02-11 20:36:17 +00:00
Justin Clarke Casey
162a59ba17 * Refactor inventory archive code to allow direct invocation in order to support future unit tests
* Add a file I missed out from the last commit (the build was probably fine without it)
2009-02-11 18:46:51 +00:00
Justin Clarke Casey
04d6a810b6 * More inventory archive invocation to a proper region module
* Not ready for use yet
2009-02-11 17:34:12 +00:00
Melanie Thielker
c754160dee If an instance contains only one region, select it in the console by default 2009-02-10 23:40:22 +00:00
Melanie Thielker
9bfbfa381a Add proper handling for shared vs. unshared modules to the command
interface. Shared modules will now only get added once, so the command
handler is called once per module, not once per scene. Removal of scenes
has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
Justin Clarke Casey
8c157a7aae * Remove load and save inventory commands from the console since these are actually experimental and the storage format may soon undergo incompatible changes
* If you were using these please uncomment the code before rebuilding, but be aware that old files may become incompatible soon
2009-02-10 19:33:09 +00:00
Justin Clarke Casey
0cd5a353cf * Stop OpenSim crashing if an exception from a command makes it right up to the top of the stack 2009-02-10 18:50:25 +00:00
Justin Clarke Casey
566bc33824 * Fix build break, parentheses in the wrong place 2009-02-10 15:46:38 +00:00
Justin Clarke Casey
5b7a5696e5 * Overwrite the old saved OpenSim.ini file saved in response to a crash if one already exists 2009-02-10 15:35:41 +00:00
Dr Scofield
180be7de07 this is step 2 of 2 of the OpenSim.Region.Environment refactor.
NOTHING has been deleted or moved off to forge at this point.  what
has happened is that OpenSim.Region.Environment.Modules has been split
in two:

- OpenSim.Region.CoreModules: all those modules that are either
  directly or indirectly referenced from  other  OpenSim packages, or
  that provide functionality that the OpenSim developer community
  considers core functionality:

      CoreModules/Agent/AssetTransaction
      CoreModules/Agent/Capabilities
      CoreModules/Agent/TextureDownload
      CoreModules/Agent/TextureSender
      CoreModules/Agent/TextureSender/Tests
      CoreModules/Agent/Xfer
      CoreModules/Avatar/AvatarFactory
      CoreModules/Avatar/Chat/ChatModule
      CoreModules/Avatar/Combat
      CoreModules/Avatar/Currency/SampleMoney
      CoreModules/Avatar/Dialog
      CoreModules/Avatar/Friends
      CoreModules/Avatar/Gestures
      CoreModules/Avatar/Groups
      CoreModules/Avatar/InstantMessage
      CoreModules/Avatar/Inventory
      CoreModules/Avatar/Inventory/Archiver
      CoreModules/Avatar/Inventory/Transfer
      CoreModules/Avatar/Lure
      CoreModules/Avatar/ObjectCaps
      CoreModules/Avatar/Profiles
      CoreModules/Communications/Local
      CoreModules/Communications/REST
      CoreModules/Framework/EventQueue
      CoreModules/Framework/InterfaceCommander
      CoreModules/Hypergrid
      CoreModules/InterGrid
      CoreModules/Scripting/DynamicTexture
      CoreModules/Scripting/EMailModules
      CoreModules/Scripting/HttpRequest
      CoreModules/Scripting/LoadImageURL
      CoreModules/Scripting/VectorRender
      CoreModules/Scripting/WorldComm
      CoreModules/Scripting/XMLRPC
      CoreModules/World/Archiver
      CoreModules/World/Archiver/Tests
      CoreModules/World/Estate
      CoreModules/World/Land
      CoreModules/World/Permissions
      CoreModules/World/Serialiser
      CoreModules/World/Sound
      CoreModules/World/Sun
      CoreModules/World/Terrain
      CoreModules/World/Terrain/DefaultEffects
      CoreModules/World/Terrain/DefaultEffects/bin
      CoreModules/World/Terrain/DefaultEffects/bin/Debug
      CoreModules/World/Terrain/Effects
      CoreModules/World/Terrain/FileLoaders
      CoreModules/World/Terrain/FloodBrushes
      CoreModules/World/Terrain/PaintBrushes
      CoreModules/World/Terrain/Tests
      CoreModules/World/Vegetation
      CoreModules/World/Wind
      CoreModules/World/WorldMap

- OpenSim.Region.OptionalModules: all those modules that are not core
  modules:

      OptionalModules/Avatar/Chat/IRC-stuff
      OptionalModules/Avatar/Concierge
      OptionalModules/Avatar/Voice/AsterixVoice
      OptionalModules/Avatar/Voice/SIPVoice
      OptionalModules/ContentManagementSystem
      OptionalModules/Grid/Interregion
      OptionalModules/Python
      OptionalModules/SvnSerialiser
      OptionalModules/World/NPC
      OptionalModules/World/TreePopulator
2009-02-10 13:10:57 +00:00
Melanie Thielker
a1393db7f0 Stopgap measure: To use gridlaunch, or GUI, start opensim with
OpenSim.exe -gui=true
2009-02-10 12:25:29 +00:00
Sean Dague
8088802c21 From Alan Webb <awebb@linux.vnet.ibm.com>
These changes replace all direct references to the AssetCache with
IAssetCache. There is no change to functionality. Everything works as
before.

This is laying the groundwork for making it possible to register
alternative asset caching mechanisms without disrupting other parts of
OpenSim or their dependencies upon AssetCache functionality.
2009-02-09 21:47:55 +00:00
Justin Clarke Casey
a034b640da * Add the ability to type help <command> for more detailed help about a specific command if any is available 2009-02-09 20:52:04 +00:00
Justin Clarke Casey
d1d93fae6c * Restore show information for the OpenSim region server (version, info, threads, etc.) 2009-02-09 18:11:09 +00:00
Melanie Thielker
2fe9915951 Reinstate the KickUserCommand handler, which was commented out by
another dev whiel I was putting the reference to it back in
2009-02-09 16:34:21 +00:00
Melanie Thielker
8a9128ccce Correct a delegate in OpenSim.cs
Fixes Mantis #3117
2009-02-09 16:21:13 +00:00
Dr Scofield
b1739cbbfd fixing warnings. 2009-02-09 10:40:12 +00:00
Dr Scofield
a89d097355 starting phase 2 of the OpenSim.Region.Environment commit: relocating
OpenSim.Region.Environment.Modules.Agent en bloc to OpenSim.Region.CoreModules
2009-02-09 09:16:15 +00:00