aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-02-141-4/+21
|\
| * Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-4/+21
| |
* | Merge branch 'avination' into careminsterMelanie2013-02-141-0/+2
|\ \ | |/
| * Small fix to sim features moduleMelanie2013-02-141-0/+2
| |
| * 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 'avination' into careminsterMelanie2013-02-072-115/+70
|\ \ | |/
| * Rename Bounciness to RestitutionMelanie2013-02-072-2/+2
| |
| * Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-062-115/+70
| |
| * * 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-072-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-052-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-052-2/+2
| |\ \
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-01-311-2/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | * Adds a satisfying angular roll when an avatar is flying and turning. ↵teravus2013-01-301-1/+1
| | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff.
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-3/+18
|\ \ \ | | |/ | |/|
| * | * Handle a NRE with Baked Textures that may result in a failed appearance. ↵teravus2013-01-221-3/+18
| | | | | | | | | | | | This may be an issue, or it may be a symptom.
* | | Merge branch 'avination'Melanie2013-01-194-43/+66
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * | Remove group IM test code also mentioning "OpenSimulator Testing"Melanie2013-01-191-26/+1
| | |
| * | Add a way to put things at the front of the queue for any throttle group.Melanie2013-01-163-15/+57
| | | | | | | | | | | | | | | | | | | | | Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added a flag value to the Throttle Type (again) because although it's hacky, it's the best of a bad bunch to get the message through the UDP stack to where it's needed.
| * | Merge branch 'ubitwork' into avinationMelanie2013-01-161-2/+8
| |\ \
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2013-01-161-2/+12
| | |\ \
| | * | | try to patch getmesh Throttle (test)UbitUmarov2013-01-131-2/+8
| | | | |
| * | | | Change all uses of the removed state queue to the task queue for now.Melanie2013-01-161-5/+5
| | | | |
| * | | | Complete removal of the now unused state queueMelanie2013-01-162-14/+3
| | |/ / | |/| |
| * | | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-131-2/+12
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-01-162-19/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-161-12/+3
| |\ \
| * | | Complete removal of the now unused state queueMelanie2013-01-162-15/+4
| | | |
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-12/+3
|\ \ \ \ | | |/ / | |/| |
| * | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵dahlia2013-01-141-12/+3
| |/ / | | | | | | | | | other than the object currently sat on
* | | Merge branch 'master' into careminsterMelanie2013-01-131-2/+12
|\ \ \ | |/ /
| * | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-101-2/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-101-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-2/+20
| | | | | | | | | | | | work.
* | | Merge branch 'avination' into careminsterMelanie2013-01-103-20/+314
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-0/+19
| | | | | | | | | | | | work.
| * | * Fixed a bug that replayed old cached appearance when changing outfitsteravus2012-12-312-46/+111
| | | | | | | | | | | | | | | | | | * Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount. * Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info. * If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-292-20/+230
| | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-27/+60
|\ \ \ | |/ /
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-5/+21
| | | | | | | | | | | | Cached Bakes.
| * | Merge branch 'avination' of careminster:/var/git/careminster into teravusworkteravus2012-12-193-12/+57
| |\ \
| * | | * This is a better way to do the last commit.teravus2012-12-081-30/+33
| | | |
| * | | * Should promote faster self appearance.teravus2012-12-071-19/+33
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-12-211-5/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Disable UDPPacketBuffer pooling for now to resolve an issue on Windows of ↵Justin Clark-Casey (justincc)2012-12-191-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interference between incoming packets. On Windows, concurrent multi-threaded processing of inbound UDP somehow allows different data input processing to interfere with each other. Possibly the endpoint reference is being switched, though I don't yet know the mechanism. Not seen on Mono. Also resolveable by setting RecyclePackets = false or RecycleBaseUDPPackets = false in [PacketPool] Or async_packet_handling = false in [ClientStack.LindenUDP] For now, will simply disable this particular pooling though will revisit this issue. In response to http://opensimulator.org/mantis/view.php?id=6468
generated by cgit v1.1 at 2025-01-01 14:11:56 +0000