aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge branch 'avination' into careminsterMelanie2012-12-183-12/+57
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ubitwork' into avinationMelanie2012-12-141-10/+55
| |\ \ \
| | * | | FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | more messy)
| | * | | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-131-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED*
| | * | | typo fixUbitUmarov2012-12-101-2/+3
| | | | |
| | * | | add velocityinterpolator packets handling but actually do nothing, sinceUbitUmarov2012-12-091-1/+27
| | | | | | | | | | | | | | | | | | | | they don't do what i was looking for.
| | * | | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-1/+2
| | | |/ | | |/| | | | | | | | | since at least for now seems good enought
| * | | Prevent a failed user relogi from throwing exceptions in poll servicesMelanie2012-12-142-2/+2
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-12-161-2/+4
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | minor: add some more detail to the logging if an LLClientView fails to ↵Justin Clark-Casey (justincc)2012-12-131-2/+4
| | | | | | | | | | | | process a packet
* | | Merge branch 'master' into careminsterMelanie2012-11-253-3/+3
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-243-3/+3
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'avination' into careminsterMelanie2012-11-221-7/+35
|\ \
| * | * While this is not producing any problems.. and does help in low bandwidth ↵teravus2012-11-221-7/+35
| | | | | | | | | | | | situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
* | | Merge branch 'avination' into careminsterMelanie2012-11-203-18/+88
|\ \ \ | |/ /
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-173-18/+88
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-1510-823/+164
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-1510-164/+823
| |\ \
* | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-202-72/+409
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-092-73/+410
| | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
* | | | Merge branch 'avination' into careminsterMelanie2012-11-172-14/+183
|\ \ \ \ | |/ / /
generated by cgit v1.1 at 2024-12-23 17:01:59 +0000