aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-141-2/+4
|\
| * In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵Justin Clark-Casey (justincc)2011-12-131-2/+4
| | | | | | | | | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
* | Merge branch 'master' into careminsterMelanie2011-12-101-0/+12
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-101-0/+12
| |
* | Merge branch 'master' into careminsterMelanie2011-12-101-12/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-091-12/+4
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into bigmergeMelanie2011-12-094-240/+278
|\ \ | |/
| * Don't reply with an ack packet if the client is not authorized.Justin Clark-Casey (justincc)2011-12-082-45/+31
| |
| * Extend TestAddClient() to check that the first packet received is an ack packetJustin Clark-Casey (justincc)2011-12-083-93/+116
| |
| * Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suiteJustin Clark-Casey (justincc)2011-12-081-1/+1
| |
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-083-109/+138
| | | | | | | | 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-081-4/+4
| | | | | | | | | | 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 bigmergeMelanie2011-12-083-21/+46
|\ \ | |/ | | | | | | 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-083-21/+46
| | | | | | | | | | | | | | | | | | 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 branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-082-7/+1
|\ \
| * \ Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-082-7/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-6/+0
| | | | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
| | * Stop accidentally setting up the UploadTexture caps handler with the same ↵Justin Clark-Casey (justincc)2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
* | | Recover from an internal mess-up in the outgoing packet queues by creatingMelanie2011-12-081-19/+36
|/ / | | | | | | a new queue object.
* | Merge branch 'master' into bigmergeMelanie2011-12-051-3/+3
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-3/+3
| | | | | | | | | | | | | | | | 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 bigmergeMelanie2011-12-052-122/+113
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * refactor: Separate the upload baked texture handler out from BunchOfCapsJustin Clark-Casey (justincc)2011-12-012-122/+113
| |
* | Implement ChangeInventoryItemFlagsPacket handlingMelanie2011-12-041-0/+16
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-012-2/+4
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+2
| |
| * Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-0/+1
| |
| * Correct mistake in "debug eq" helpJustin Clark-Casey (justincc)2011-11-291-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-284-170/+280
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().Justin Clark-Casey (justincc)2011-11-261-1/+0
| | | | | | | | This has been handled by WebFetchInvDescHandler.Fetch() for some time.
| * Use the same web fetch handler for every request from every avatar, since it ↵Justin Clark-Casey (justincc)2011-11-261-3/+11
| | | | | | | | contains no instance code
| * Fix config so that you can have both WebFetchInventoryDescendents and ↵Justin Clark-Casey (justincc)2011-11-251-1/+2
| | | | | | | | FetchInvnetoryDescendents2 caps active at once
| * Resolve error where an unknown asset type would cause the fetch inventory ↵Justin Clark-Casey (justincc)2011-11-251-4/+1
| | | | | | | | | | | | descendents cap to fail. Introduced just a few commits ago in 0688861
| * Implement the FetchInventoryDescendents2 capability using the same code as ↵Justin Clark-Casey (justincc)2011-11-251-17/+38
| | | | | | | | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
| * Fix WebFetchInventoryDescendents cap to use ↵Justin Clark-Casey (justincc)2011-11-251-0/+2
| | | | | | | | | | | | Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings These cover a wider range of types.
| * When setting packet level logging via "debug packet", apply to all clients, ↵Justin Clark-Casey (justincc)2011-11-241-7/+11
| | | | | | | | | | | | not just root ones. Also adds scene name and client type (root|child) to logged information.
| * comment out a noisy log line I accidentally left in from the last commitJustin Clark-Casey (justincc)2011-11-241-1/+1
| |
| * Stop passing a request handler to the initial caps.RegisterHandler in ↵Justin Clark-Casey (justincc)2011-11-241-157/+162
| | | | | | | | | | | | EventQueueGetModule since this is immediatley replaced by a poll server handler. This allows us to comment out a bunch of code and simplify the codebase and readability.
| * Add a "debug eq" console command for debugging.Justin Clark-Casey (justincc)2011-11-241-6/+79
| | | | | | | | This will log outgoing event queue message names if turned on.
* | Merge branch 'master' into bigmergeMelanie2011-11-141-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * If a friends identifier which is too short is given to ↵Justin Clark-Casey (justincc)2011-11-141-0/+2
| | | | | | | | | | | | HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring(). This is to progress http://opensimulator.org/mantis/view.php?id=5789
* | Merge branch 'master' into bigmergeMelanie2011-11-111-26/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * Restore sending of OutPacket() for object kills removed in commit c7dd7b1.Justin Clark-Casey (justincc)2011-11-111-26/+20
| | | | | | | | | | | | | | | | | | | | OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible 1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket() 2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record 3) The same thread places the kill packet on the Task queue. 4) The earlier thread resumes and places the update packet on the Task queue after the kill packet. This results in a ghost part in the sim that only goes away after client relog. This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject.
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-21/+32
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Merge branch 'master' into bigmergeMelanie2011-11-031-3/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
* | Merge branch 'master' into bigmergeMelanie2011-11-021-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant SceneContents property from Scene. It's the same as ↵Dan Lake2011-11-011-1/+1
| | | | | | | | SceneGraph property.
* | Merge branch 'master' into bigmergeMelanie2011-10-301-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
generated by cgit v1.1 at 2024-12-22 12:22:35 +0000