| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -0/+3 |
| |\ | |||||
| | * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 4 | -15/+9 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | ||||
| | * | minor: comment out "unpacked appearance" log mesasge for now | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 2 | -13/+7 |
| | | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 2 | -19/+30 |
| |\ \ | |/ | |||||
| | * | Reactivate BasicCircuitTests.TestAddClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -16/+29 |
| | | | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login. | ||||
| | * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -3/+1 |
| | | | | | | | | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 3 | -3/+81 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -3/+81 |
| | | | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces | ||||
| * | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 4 | -21/+9 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -2/+2 |
| | | | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position. | ||||
| | * | Stop also adding an ordinary http handler when we set up a poll http handler. | Justin Clark-Casey (justincc) | 2011-12-07 | 3 | -19/+7 |
| | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 12 | -15/+210 |
| |\ \ | |/ | |||||
| | * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 12 | -15/+210 |
| | | | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 3 | -51/+80 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 2 | -4/+0 |
| | | | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected. | ||||
| | * | Improve locking in AgentCircuitManager | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -25/+41 |
| | | | |||||
| | * | Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -37/+54 |
| | | | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions | ||||
| * | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -15/+48 |
| |\ \ | |/ | |||||
| | * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+3 |
| | | | |||||
| | * | With "debug http 1", show the path with the query string instead of just the ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -21/+21 |
| | | | | | | | | | | | | | path. Also simplifies debug levels to just 0 and 1 | ||||
| | * | Add "debug http" command for currently simple extra debug logging of ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -12/+43 |
| | | | | | | | | | non-event queue inbound http requests to a simulator | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 3 | -59/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 2 | -2/+2 |
| | | | |||||
| | * | Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -57/+0 |
| | | | | | | | | | conversion rather than the arrays in TaskInventoryItem | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 1 | -3/+19 |
| |\ \ | |/ | |||||
| | * | Stop an exception being thrown and a teleport/border cross failing if the ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | desintation sim has no active script engines. This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry. Callers adjusted to stop checking for the list reference being null (which never happened anyway) | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 5 | -276/+35 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| | * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -8/+15 |
| | | | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in. | ||||
| | * | improve formatting of "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+8 |
| | | | |||||
| | * | send a watchdog heartbeat for a poll worker thread when it's actually run | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -0/+3 |
| | | | |||||
| | * | Add number of milliseconds since last update to "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -4/+18 |
| | | | |||||
| | * | Remove unused RegionCommsListener/IRegionCommsListener. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -272/+0 |
| | | | | | | | | | All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 |
| |\ \ | |/ | |||||
| | * | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 |
| | | | |||||
| | * | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 |
| | | | | | | | | | Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -8/+6 |
| |\ \ | |/ | |||||
| | * | Remove unused avariable in PollServiceRequestManager | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -8/+6 |
| | | | |||||
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
| | | | | | | | | | packet per prim. More to come as we change to make use of this. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -24/+12 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Fix avatar height, removes the hip offset hack | nebadon | 2011-11-05 | 1 | -24/+12 |
| | | | | | | | | | Author: Mana Janus <mana@mjm-labs.com> | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -8/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 15 | -80/+330 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | * | Restart the event queue worker threads that I accidentally disabled earlier ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -9/+11 |
| | | | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite) | ||||
| | * | In Watchdog, add ability to specific timeout for a thread. | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -16/+56 |
| | | | | | | | | | This also changes the point of registration to the StartThread() call rather than the first Update() | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |