aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-162-2/+7
|\ | | | | | | | | | | | | | | | | 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
| * Comment out log message about looking for asset data in remove asset service ↵Justin Clark-Casey (justincc)2013-05-141-1/+1
| | | | | | | | for now, in order to reduce log levels in a test region with many hg origin avatars
| * Second take at HGTP-mesh bug: delay sending the initial data only for agents ↵Diva Canto2013-05-141-1/+7
| | | | | | | | that are coming via TP (root agents)
| * Revert "HGTP-mesh bug: the mesh download requests were going to the ↵Diva Canto2013-05-141-0/+3
| | | | | | | | | | | | departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!" This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
| * HGTP-mesh bug: the mesh download requests were going to the departing sims ↵Diva Canto2013-05-141-3/+0
| | | | | | | | for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
* | Merge branch 'master' into careminsterMelanie2013-05-121-1/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Delete debug messageDiva Canto2013-05-101-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-05-111-3/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-3/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-05-081-2/+64
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+140
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+140
| |
* | Merge branch 'master' into careminsterMelanie2013-05-011-1/+12
|\ \ | |/ | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* | Merge branch 'master' into careminsterMelanie2013-04-301-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: Eliminate warning in LLimageManagerTests by properly calling through ↵Justin Clark-Casey (justincc)2013-04-291-0/+2
| | | | | | | | to OpenSimTestCase.SetUp()
* | Merge branch 'master' into careminsterMelanie2013-04-251-1/+1
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-1/+1
| | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+12
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-222-8/+6
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-211-3/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| | * amend previous commit, a line was left outdahlia2013-04-171-0/+1
| | |
| | * Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵dahlia2013-04-171-2/+6
| | | | | | | | | | | | crash with Server-side baking enabled viewers
| * | Merge branch 'master' into careminsterMelanie2013-04-161-5/+0
| |\ \ | | |/
| | * refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵Justin Clark-Casey (justincc)2013-04-161-5/+0
| | | | | | | | | | | | | | | | | | | | | Stop(). This was an undocumented interface which I think was for long defunct region load balancing experiments. Also adds method doc for some IClientNetworkServer methods.
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+12
|/ /
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
| * minor: Fix usage error message for "debug eq" console commandJustin Clark-Casey (justincc)2013-03-281-1/+1
| |
| * Add "show eq" console command to show numbers of messages in agent event queues.Justin Clark-Casey (justincc)2013-03-281-0/+23
| | | | | | | | For debugging purposes.
* | Merge branch 'master' into careminsterMelanie2013-03-261-0/+6
|\ \ | |/
| * Implement a pref to turn on the simulator ExportSupported feature entry.Melanie2013-03-261-0/+6
| | | | | | | | | | | | This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete!
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-263-5/+9
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-242-7/+10
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-03-151-19/+32
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-151-19/+32
| | | | | | | | Clean up some parameter code in Statistics.Binary.
* | Merge branch 'master' into careminsterMelanie2013-03-132-2/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * minor: Remove mono compiler warning in LLClientViewJustin Clark-Casey (justincc)2013-03-131-1/+1
| |
| * minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-03-081-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * * Just another one of those new packet blocks causing a null ref. ↵teravus2013-03-071-1/+1
| | | | | | | | Defaulting to zero length array.....
* | Merge branch 'master' into careminsterMelanie2013-03-052-7/+9
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-041-2/+4
| | | | | | | | * Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
| * Fix issue in the mesh upload flag module where the ID of the last agent to ↵Justin Clark-Casey (justincc)2013-03-041-6/+6
| | | | | | | | | | | | request the capability was always used instead of the original requesting agent for each cap. Should address http://opensimulator.org/mantis/view.php?id=6556
* | Merge branch 'avination' into careminsterMelanie2013-03-034-5/+23
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| | |
| * | Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| | |
| * | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| | |
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-0/+3
| | | | | | | | | | | | there was a handler for it.
| * | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| | |
generated by cgit v1.1 at 2024-12-19 09:43:46 +0000