aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-212-4/+4
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-201-1/+3
| | | | | | | | logging
| * Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | are starting up
| * Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses ↵Justin Clark-Casey (justincc)2012-06-161-3/+1
| | | | | | | | would always return OK even if some other status code had been set
* | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ | |/
| * Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | scattering them over other categories
* | Merge branch 'master' into careminsterMelanie2012-06-152-29/+195
|\ \ | |/
| * Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-152-4/+59
| | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
| * Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-152-11/+61
| | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
| * When setting debug http level, do this for all known http servers, not just ↵Justin Clark-Casey (justincc)2012-06-152-21/+40
| | | | | | | | the main instance.
| * Get rid of some unnecessary null checks in ↵Justin Clark-Casey (justincc)2012-06-151-4/+27
| | | | | | | | | | | | RegionApplicationBase.StartupSpecific() - a constructor can never return null. Also adds some method doc to MainServer
| * Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵Justin Clark-Casey (justincc)2012-06-141-8/+27
| | | | | | | | warn to be logged if we receive invalid xml for xmlrpc.
* | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752Justin Clark-Casey (justincc)2012-06-141-1/+1
| | | | | | | | | | Accidentally make responseString null by default instead of String.Empty. It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
* | Merge branch 'master' into careminsterMelanie2012-06-141-2/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-131-2/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-06-135-313/+169
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| * Don't include time to transmit response back to requester when assessing ↵Justin Clark-Casey (justincc)2012-06-135-314/+169
| | | | | | | | | | | | | | | | | | | | slow handling of requests. This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response. This is not something we can do much about on the server end - it's server-side delay that we're interested in. To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change. IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this. Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
* | Merge branch 'master' into careminsterMelanie2012-06-122-6/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵Justin Clark-Casey (justincc)2012-06-121-0/+7
| | | | | | | | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
| * Set IClientAPI.IsActive = false early on client removal due to ack timeout ↵Justin Clark-Casey (justincc)2012-06-121-6/+3
| | | | | | | | | | | | | | | | rather than using IsLoggingOut flag. IsActive is more appropriate since unack timeout is not due to voluntary logout. This is in line with operations such as manual kick that do not set the IsLoggingOut flag. It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
| * In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already ↵Justin Clark-Casey (justincc)2012-06-121-6/+16
| | | | | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
* | Merge branch 'master' into careminsterMelanie2012-06-091-15/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-081-15/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-06-073-18/+26
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| |
| * Allow the thread watchdog to accept an alarm method that is invoked if the ↵Justin Clark-Casey (justincc)2012-06-072-17/+25
| | | | | | | | | | | | | | timeout is breached. This alarm can then invoke this to log extra information. This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
* | Remove useless logging of a bare-names stack trace. It's meaninglessMelanie2012-06-061-32/+57
| | | | | | | | | | | | to a non-programmer and insufficient for a programmer. Add commented debug output and data collection to troubleshoot future locking issues.
* | Merge branch 'master' into careminsterMelanie2012-05-273-146/+367
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * adding status codes from rfc 6585SignpostMarv2012-05-241-2/+22
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * porting IDE tooltip-friendly documentation tweaks from Aurora-SimSignpostMarv2012-05-241-134/+223
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * refactor: Rename ConsoleTableRow and ConsoleTableColumn to ↵Justin Clark-Casey (justincc)2012-05-231-9/+9
| | | | | | | | ConsoleDisplayTableRow and ConsoleDisplayTableColumn
| * Add ConsoleDisplayList for more consistent formatting of console output in ↵Justin Clark-Casey (justincc)2012-05-231-0/+112
| | | | | | | | | | | | list form. Convert "show region" to use this structure rather than hand-constructing
| * refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-231-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-05-143-3/+71
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-3/+71
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-131-0/+3
|\ \
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-121-0/+3
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-131-0/+139
|\ \ \ | | |/ | |/|
| * | Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-71/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-3/+71
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-101-0/+139
| | | | | | | | | | | | | | | | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
* | | Merge branch 'master' into careminsterMelanie2012-05-101-2/+2
|\ \ \ | |/ /
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-2/+2
| | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | | Merge branch 'master' into careminsterMelanie2012-05-081-19/+19
|\ \ \ | |/ /
| * | Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-071-4/+8
|\ \ \ | |/ /
| * | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for ↵dahlia2012-05-071-4/+8
| | | | | | | | | | | | OpenMetaverse.Primitive object
* | | Merge branch 'avination' into careminsterMelanie2012-05-051-1/+24
|\ \ \ | | |/ | |/|
| * | Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| | |
generated by cgit v1.1 at 2024-11-20 09:36:01 +0000