aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-0/+2
|\ \ \ | |/ /
| * | Small fix to sim features moduleMelanie2013-02-141-0/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-7/+70
|\ \ \ | |/ /
| * | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-7/+70
| | |
* | | 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
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-051-1/+1
| |\ \
| | * | 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.
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | 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-191-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * | try to patch getmesh Throttle (test)UbitUmarov2013-01-131-2/+8
| | |
* | | 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-102-4/+196
|\ \ \ | | |/ | |/| | | | | | | 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-311-41/+82
| | | | | | | | | | | | | | | | | | * 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-4/+136
| | | | | | | | | | | | 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 careminsterMelanie2012-12-182-2/+2
|\ \ \ | |/ /
| * | Prevent a failed user relogi from throwing exceptions in poll servicesMelanie2012-12-142-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | 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-241-1/+1
| | | | | | | | 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-201-18/+72
|\ \ \ | |/ /
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-18/+72
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-154-13/+21
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-154-21/+13
| |\ \
* | \ \ 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-171-14/+172
|\ \ \ \ | |/ / /
| * | | This implements the Caps throttler. After some testing, the system seemed ↵teravus2012-11-051-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. Tested with Two Clients on a region with 1800 textures all visible at once.
| * | | Another step in the chain. Pipe the throttle update to the appropriate ↵teravus2012-11-051-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator. Next step is hooking it up to HasEvents
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-0/+42
| | | | | | | | | | | | | | | | 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-0/+33
|\ \ \ \ | | |_|/ | |/| |
| * | | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-0/+33
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-1311-13/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1212-12/+12
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-122-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-123-5/+5
| | | | | | | | | | | | | | | | grepping for remaining uses
* | | | Merge branch 'master' into careminsterMelanie2012-11-112-102/+102
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | One more module converted: ObjectAdd.Diva Canto2012-11-101-51/+66
| | |
| * | One more module: EventQueueGetModule. Also making it non-optional for this dll.Diva Canto2012-11-101-53/+38
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-10-182-12/+12
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | Remove redundant and annoyingly modal message box in upload processing.Melanie2012-10-181-11/+11
| | |
| * | Allow the console to be used by gods as well as region owners.Melanie2012-10-171-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-10-171-2/+2
|\ \ \ | |/ /
| * | Make texture sedning use only two threads to make things less harsh on bandwidthMelanie2012-10-141-2/+2
| | |
generated by cgit v1.1 at 2024-12-26 11:08:48 +0000