aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-061-5/+0
|\
| * CleanupBlueWall2013-06-051-5/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-06-042-0/+580
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding standard OpenSim header to source filesBlueWall2013-05-312-0/+54
| |
| * UserProfilesBlueWall2013-05-302-0/+526
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | Merge branch 'master' into careminsterMelanie2013-05-166-8/+27
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Where this is not already happening, trigger asychoronous calls to ↵Justin Clark-Casey (justincc)2013-05-161-1/+1
| | | | | | | | | | | | | | CloseChildAgent() above the LocalSimulationConnector level. This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes). No functional change apart from elimination of unnecessary chaining of new threads.
| * Fixed mantis #6609 -- LoadPlugin error messages on Robust.Diva Canto2013-05-135-7/+26
| |
* | Merge branch 'master' into careminsterMelanie2013-04-301-5/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: remove some mono compiler warnings in ServicesServerBaseJustin Clark-Casey (justincc)2013-04-291-5/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-04-291-0/+1
|\ \ | |/
| * Better error reportingDiva Canto2013-04-271-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-03-153-15/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * minor: log an error rather than info if a connector fails to load.Justin Clark-Casey (justincc)2013-03-151-1/+1
| |
| * minor: Make logged message in ServerUtils more consistent.Justin Clark-Casey (justincc)2013-03-151-10/+10
| |
| * Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2013-03-141-4/+1
| | | | | | | | simulator logs, for debug purposes
* | Merge branch 'master' into careminsterMelanie2013-03-011-0/+4
|\ \ | |/
| * minor: Log location in which simulator/robust was started.Justin Clark-Casey (justincc)2013-02-281-0/+4
| | | | | | | | Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
* | Merge branch 'master' into careminsterMelanie2013-02-281-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Switched to using the other Util function with a default value.Diva Canto2013-02-271-1/+2
| |
| * Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-271-1/+1
| | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | Merge branch 'master' into careminsterMelanie2013-02-231-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-221-1/+1
| | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | Merge branch 'master' into careminsterMelanie2013-02-223-11/+13
|\ \ | |/
| * Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-9/+11
| | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-192-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-053-3/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-053-3/+3
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-2/+5
|\ \ | |/
| * Print full stacktrace from plugin loading failure to help determine what ↵Justin Clark-Casey (justincc)2013-01-151-2/+5
| | | | | | | | went wrong, rather than a possibly unhelpful simple exception message.
* | Merge branch 'master' into careminsterMelanie2012-12-161-10/+46
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Fix formattingBlueWall2012-12-131-21/+24
| |
| * Fix module pathname handling for WindowsBlueWall (James Hughes)2012-12-131-16/+22
| |
| * Hide some console output when initializing addin repositoryBlueWall2012-12-111-0/+27
| | | | | | | | We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
* | Merge branch 'master' into careminsterMelanie2012-12-095-1/+608
|\ \ | |/
| * Prebuild fixBlueWall2012-12-071-1/+1
| | | | | | | | Had moved the class to a different namespace but failed to add the reference
| * Merge branch 'master' into connector_pluginBlueWall2012-11-259-172/+296
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * | Move PluginManagerBlueWall2012-10-194-564/+16
| | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use
| * | Add logging to help track sequence of eventsBlueWall2012-10-111-0/+2
| | |
| * | Implement plugin unloadingBlueWall2012-10-102-4/+16
| | | | | | | | | | | | Plugin may be enabled and disabled on the fly.
| * | Fix registry issueBlueWall2012-10-091-1/+7
| | | | | | | | | | | | Rebuild registry if loading from a local dll to give access to the addin data for it on the first pass.
| * | missed some conflict markupBlueWall2012-10-091-1/+0
| | |
| * | Merge branch 'master' into connector_pluginBlueWall2012-10-091-2/+21
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/ServerMain.cs
| * | | Added parts to manage repositories and plugin managementBlueWall2012-10-065-0/+1028
| | | | | | | | | | | | | | | | This is working - more testing to follow, then soem documentation
| * | | Add modular configuration for Robust connectorsBlueWall2012-10-033-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing.
* | | | Merge branch 'master' into careminsterMelanie2012-11-222-139/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-39/+0
| | | | | | | | | | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * | | Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-222-15/+6
| | | |
| * | | Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-221-22/+3
| | | | | | | | | | | | | | | | Log path at which pid file is created or reason for failure to create.
| * | | Make "set log level" command available across all serversJustin Clark-Casey (justincc)2012-11-221-1/+0
| | | |
generated by cgit v1.1 at 2024-12-30 16:54:17 +0000