aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination'Melanie2013-01-191-30/+5
|\ | | | | | | | | | | | | 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-161-4/+4
| | | | | | | | | | | | | | 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.
| * 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-161-1/+1
| |
| * add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-131-2/+12
| |
* | Merge branch 'master' into careminsterMelanie2013-01-161-6/+6
|\ \ | | | | | | | | | | | | | | | | | | 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-161-1/+1
| | | |
* | | | 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 'avination' into careminsterMelanie2013-01-101-16/+118
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * Fixed a bug that replayed old cached appearance when changing outfitsteravus2012-12-311-5/+29
| | | | | | | | | | | | | | | | | | * 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-291-16/+94
| | | | | | | | | | | | 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-191-10/+55
| |\ \
| * | | * 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 'avination' into careminsterMelanie2012-12-181-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
* | | 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 'avination' into careminsterMelanie2012-11-201-0/+12
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+12
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-151-103/+66
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-151-66/+103
| |\ \
* | \ \ Merge branch 'avination' into careminsterMelanie2012-11-171-0/+11
|\ \ \ \ | |/ / /
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-0/+11
| | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
* | | | Merge branch 'master' into careminsterMelanie2012-11-151-3/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | Handle Map block requests on a separate thread rather than the main packet ↵Justin Clark-Casey (justincc)2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | handling thread. This prevents a slow grid information network call from holding up the main packet handling thread. There's no obvious race condition reason for not doing this asynchronously.
| * | Do HandleMapLayerRequest on its own thread rather than on the main inbound ↵Justin Clark-Casey (justincc)2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | udp packet handling thread. There's no obvious race condition reason for doing this on the main packet handling thread.
| * | Following on from 4f982596, launch map name requests on an async thread from ↵Justin Clark-Casey (justincc)2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
* | | Merge branch 'master' into careminsterMelanie2012-10-311-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously ↵Justin Clark-Casey (justincc)2012-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | rather than synchronously. This is to avoid the entire scene loop being held up when the group service is slow to respond. There's no obvious reason for these queries to be sync rather than async.
* | | Merge branch 'master' into careminsterMelanie2012-10-261-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-3/+4
| | | | | | | | | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
* | | Merge branch 'master' into careminsterMelanie2012-10-181-15/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| * | minor: Remove event method doc from LLClientView that I forgot in the last ↵Justin Clark-Casey (justincc)2012-10-181-15/+0
| | | | | | | | | | | | commit (1de80c)
* | | Merge branch 'master' into careminsterMelanie2012-10-181-41/+68
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of ↵Justin Clark-Casey (justincc)2012-10-171-41/+68
| | | | | | | | | | | | | | | | | | which there are 10 a second) rather than constructing a new one every time. We can do this because AgentUpdate packets are handled synchronously.
* | | Merge branch 'master' into careminsterMelanie2012-10-171-4/+7
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | Explicitly return only the incoming AgentUpdate packet as this is the only ↵Justin Clark-Casey (justincc)2012-10-171-4/+7
| | | | | | | | | | | | one we pool atm, rather than attempting to return all incoming packets.
* | | Merge branch 'master' into careminsterMelanie2012-10-161-2/+14
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
generated by cgit v1.1 at 2025-01-10 22:56:52 +0000