Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵ | teravus | 2013-01-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2013-01-27 | 1 | -3/+18 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | * Handle a NRE with Baked Textures that may result in a failed appearance. ↵ | teravus | 2013-01-22 | 1 | -3/+18 | |
| | | | | | | | | | | | | This may be an issue, or it may be a symptom. | |||||
* | | | Merge branch 'avination' | Melanie | 2013-01-19 | 4 | -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" | Melanie | 2013-01-19 | 1 | -26/+1 | |
| | | | ||||||
| * | | Add a way to put things at the front of the queue for any throttle group. | Melanie | 2013-01-16 | 3 | -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 avination | Melanie | 2013-01-16 | 1 | -2/+8 | |
| |\ \ | ||||||
| | * \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2013-01-16 | 1 | -2/+12 | |
| | |\ \ | ||||||
| | * | | | try to patch getmesh Throttle (test) | UbitUmarov | 2013-01-13 | 1 | -2/+8 | |
| | | | | | ||||||
| * | | | | Change all uses of the removed state queue to the task queue for now. | Melanie | 2013-01-16 | 1 | -5/+5 | |
| | | | | | ||||||
| * | | | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 2 | -14/+3 | |
| | |/ / | |/| | | ||||||
| * | | | add some sanity checking to HandleAgentRequestSit handler | dahlia | 2013-01-13 | 1 | -2/+12 | |
| |/ / | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-16 | 2 | -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/opensim | Melanie | 2013-01-16 | 1 | -12/+3 | |
| |\ \ | ||||||
| * | | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 2 | -15/+4 | |
| | | | | ||||||
* | | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster | Melanie | 2013-01-16 | 1 | -12/+3 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵ | dahlia | 2013-01-14 | 1 | -12/+3 | |
| |/ / | | | | | | | | | | other than the object currently sat on | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-13 | 1 | -2/+12 | |
|\ \ \ | |/ / | ||||||
| * | | add some sanity checking to HandleAgentRequestSit handler | dahlia | 2013-01-10 | 1 | -2/+12 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-10 | 1 | -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 viewers | Melanie | 2013-01-08 | 1 | -2/+20 | |
| | | | | | | | | | | | | work. | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 3 | -20/+314 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | Add the new UpdateAgentInformation cap to make maturity on more recent viewers | Melanie | 2013-01-08 | 1 | -0/+19 | |
| | | | | | | | | | | | | work. | |||||
| * | | * Fixed a bug that replayed old cached appearance when changing outfits | teravus | 2012-12-31 | 2 | -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 ↵ | teravus | 2012-12-29 | 2 | -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 careminster | Melanie | 2013-01-06 | 1 | -27/+60 | |
|\ \ \ | |/ / | ||||||
| * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 1 | -5/+21 | |
| | | | | | | | | | | | | Cached Bakes. | |||||
| * | | Merge branch 'avination' of careminster:/var/git/careminster into teravuswork | teravus | 2012-12-19 | 3 | -12/+57 | |
| |\ \ | ||||||
| * | | | * This is a better way to do the last commit. | teravus | 2012-12-08 | 1 | -30/+33 | |
| | | | | ||||||
| * | | | * Should promote faster self appearance. | teravus | 2012-12-07 | 1 | -19/+33 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-12-21 | 1 | -5/+8 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Disable UDPPacketBuffer pooling for now to resolve an issue on Windows of ↵ | Justin Clark-Casey (justincc) | 2012-12-19 | 1 | -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 careminster | Melanie | 2012-12-18 | 3 | -12/+57 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-12-14 | 1 | -10/+55 | |
| |\ \ \ | ||||||
| | * | | | FIX small avatars movement on terrain. (avatar appearance getting even | UbitUmarov | 2012-12-13 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | more messy) | |||||
| | * | | | add a Check method to flotsamAssetCache, so to check if a asset is in | UbitUmarov | 2012-12-13 | 1 | -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 fix | UbitUmarov | 2012-12-10 | 1 | -2/+3 | |
| | | | | | ||||||
| | * | | | add velocityinterpolator packets handling but actually do nothing, since | UbitUmarov | 2012-12-09 | 1 | -1/+27 | |
| | | | | | | | | | | | | | | | | | | | | they don't do what i was looking for. | |||||
| | * | | | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 1 | -1/+2 | |
| | | |/ | | |/| | | | | | | | | | since at least for now seems good enought | |||||
| * | | | Prevent a failed user relogi from throwing exceptions in poll services | Melanie | 2012-12-14 | 2 | -2/+2 | |
| |/ / | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -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-13 | 1 | -2/+4 | |
| | | | | | | | | | | | | process a packet | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 3 | -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-24 | 3 | -3/+3 | |
| | | | | | | | | automatically turns off any logging enabled between tests | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-11-22 | 1 | -7/+35 | |
|\ \ | ||||||
| * | | * While this is not producing any problems.. and does help in low bandwidth ↵ | teravus | 2012-11-22 | 1 | -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 careminster | Melanie | 2012-11-20 | 3 | -18/+88 | |
|\ \ \ | |/ / | ||||||
| * | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 3 | -18/+88 | |
| | | | | | | | | | | | | * Last step is to flip the throttle distribution. | |||||
| * | | Revert "Merge master into teravuswork", it should have been avination, not ↵ | teravus | 2012-11-15 | 11 | -824/+165 | |
| | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64. | |||||
| * | | Merge master into teravuswork | teravus | 2012-11-15 | 11 | -165/+824 | |
| |\ \ |