aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-173-10/+4
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * Remove some mono compiler warnings from OpenSim/Server/HandlersJustin Clark-Casey (justincc)2013-08-173-10/+4
| |
* | Merge branch 'master' into careminsterMelanie2013-07-1821-128/+50
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Change the auth token to be the user's sessionid.Diva Canto2013-07-141-1/+4
| |
| * Guard against unauthorized agent deletes.Diva Canto2013-07-131-5/+11
| |
| * Deleted GET agent all around. Not used.Diva Canto2013-07-131-59/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| |\
| | * Print out caller IP when unusual requests are received.Diva Canto2013-07-071-1/+1
| | |
| * | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-0821-42/+35
| |/ | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' into careminsterMelanie2013-07-041-2/+4
|\ \ | |/
| * Deleted debug messages. Fixed a null ref exception on the POST handler of ↵Diva Canto2013-07-021-2/+4
| | | | | | | | GridUserServerPostHandler.cs
* | Merge branch 'master' into careminsterMelanie2013-06-301-7/+5
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Remove "Asset deletion not supported by database" message from "delete ↵Justin Clark-Casey (justincc)2013-06-281-7/+5
| | | | | | | | | | | | asset" robust/standalone console command since it actually was implemented and performed. Improve other associated messages.
* | Merge branch 'master' into careminsterMelanie2013-06-235-193/+108
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-1/+0
| | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-214-180/+100
| |
| * Make number of inbound http requests handled available as a ↵Justin Clark-Casey (justincc)2013-06-181-0/+4
| | | | | | | | httpserver.<port>.IncomingHTTPRequestsProcessed stat
| * Make general server stats available on the robust console as well as the ↵Justin Clark-Casey (justincc)2013-06-171-12/+4
| | | | | | | | | | | | simulator console This means the "show stats" command is now active on the robust console.
* | Merge branch 'master' into careminsterMelanie2013-06-131-1/+1
|\ \ | |/
| * After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, ↵Justin Clark-Casey (justincc)2013-06-121-1/+1
| | | | | | | | | | | | | | consistently check for null return and log warning rather than throw exception. This was being done already in some places. If an exception is thrown it is now an error rather than debug
* | 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.
generated by cgit v1.1 at 2025-01-10 06:56:14 +0000