aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP (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-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-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.
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-3/+5
| | | | | | | | | | | | 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"
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+12
|/ /
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-3/+5
| | | | | | | | 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-131-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * minor: Remove mono compiler warning in LLClientViewJustin Clark-Casey (justincc)2013-03-131-1/+1
| |
* | 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-051-2/+4
|\ \ | |/ | | | | | | | | | | | | 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.
* | Merge branch 'avination' into careminsterMelanie2013-03-031-3/+14
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| | |
| * | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| | |
| * | Revert "Push updates from keyframe directly to the front of the output queue ↵Melanie2013-02-121-20/+0
| | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
| * | Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
| | | | | | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010.
| * | Use actual time dilation for unqueued updatesMelanie2013-02-121-1/+1
| | |
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-121-0/+20
| | | | | | | | | | | | than through the update system.
* | | Merge branch 'master' into careminsterMelanie2013-02-222-1/+14
|\ \ \ | | |/ | |/|
| * | Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-201-0/+5
| | | | | | | | | | | | | | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format).
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
| * | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| | |
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-071-4/+55
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-108/+0
|\ \ \ | | |/ | |/|
| * | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-108/+0
| | |
| * | * Adds a satisfying angular roll when an avatar is flying and turning. ↵Melanie2013-01-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
* | | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.