aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2134-350/+885
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Revert "Add support for user preferences (im via email)"Melanie2013-12-072-55/+0
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| * Merge branch 'master' into careminsterMelanie2013-12-072-0/+55
| |\
| | * Add support for user preferences (im via email)BlueWall2013-12-062-0/+55
| | |
| * | Merge branch 'master' into careminsterMelanie2013-11-032-1/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * * Remove a test *cleanup*teravus2013-10-071-10/+2
| | |
| | * * Refactorteravus2013-10-071-1/+1
| | | | | | | | | | | | * Break out common BasicDOSProtector code into separate class.
| | * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-073-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
| * | Merge branch 'master' into careminsterMelanie2013-10-064-2/+59
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * * Added a unique and interesting WebSocket grid login processor by hijacking ↵teravus2013-10-042-0/+57
| | | | | | | | | | | | the LLSD login code. This sends the data through the normal login channels and spits out a JSON object back that mimics the login response. Feel free to comment on the best way to set this up as a config option.
| | * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-042-2/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2013-09-071-0/+33
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
| * | 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
| | |
* | | Add forgotten fileMelanie Thielker2014-06-211-0/+249
| | |
* | | Allow opening a https port using only http so that nginx can be used for sslMelanie Thielker2014-04-261-11/+21
|/ /
* | 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
| |
generated by cgit v1.1 at 2024-11-19 00:27:32 +0000