aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-03-031-0/+13
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-0/+13
| | | | | | | | there was a handler for it.
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-1/+1
|\ \ \ | | |/ | |/|
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-1/+1
| | |
* | | 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
| * | 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.
* | | Merge branch 'avination' into careminsterMelanie2013-01-231-4/+19
|\ \ \ | | |/ | |/|
| * | * A better way to handle the last fix (This is in case the viewer provides a ↵teravus2013-01-211-10/+16
| | | | | | | | | | | | list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.
| * | * The fallthrough of FetchTexture was no longer resulting in a 404 response ↵teravus2013-01-211-1/+10
| | | | | | | | | | | | on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-3/+10
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-3/+10
| | | | | | | | | | | | 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-1/+1
|\ \ \ | |/ /
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+1
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2012-12-071-1/+34
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: change method doc on GetTextureHandler.TryParseRange(), mainly to ↵Justin Clark-Casey (justincc)2012-12-061-2/+2
| | | | | | | | | | | | trigger another build
| * | Allow GetTexture calls with no second value in the range header (e.g. just ↵Justin Clark-Casey (justincc)2012-12-061-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | 5333-) It looks like the latest Kokua is doing this. As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, leaving off the second value is legal This indicates the caller wants the rest of the entity.
* | | Merge branch 'avination' into careminsterMelanie2012-11-251-0/+3
|\ \ \ | | |/ | |/|
| * | * Fix a null ref error in ↵teravus2012-11-241-0/+3
| | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
* | | 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-201-1/+20
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-1/+20
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-151-16/+2
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-151-2/+16
| |\ \
* | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-5/+135
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | | * Fixes mesh loading issues in last commit.teravus2012-11-151-0/+9
| | | |
| * | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-5/+126
| | | | | | | | | | | | | | | | * 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-1/+5
|\ \ \ \ | |/ / /
| * | | Another step in the chain. Pipe the throttle update to the appropriate ↵teravus2012-11-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵Diva Canto2012-11-132-0/+66
| | | | | | | | | | | | which had been forgotten.)
| * | minor: Comment out "Client requested range for texture ... but" message. ↵Justin Clark-Casey (justincc)2012-10-121-3/+3
| | | | | | | | | | | | This is not useful during normal operation.
* | | Merge branch 'avination' into careminsterMelanie2012-09-274-11/+37
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | don't send a partial contents report if we are sending all dataUbitUmarov2012-09-261-10/+15
| | |
| * | fix GetTextureHandler rangeUbitUmarov2012-09-261-1/+5
| | |
| * | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes
| * | report asset upload errors the right awayUbitUmarov2012-09-222-0/+12
| | |
| * | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-0/+4
| | | | | | | | | | | | more needed fields in request
* | | Merge branch 'avination' into careminsterMelanie2012-09-165-107/+112
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-97/+80
| | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * | report mesh upload costs ( fake values)UbitUmarov2012-09-111-1/+22
| | |
| * | let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-1/+10
| | | | | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
* | | Merge branch 'master' into careminsterMelanie2012-09-071-7/+29
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * If the GetTexture capability receives a request for a range of data beyond ↵Justin Clark-Casey (justincc)2012-09-061-5/+29
| | | | | | | | | | | | | | | | | | | | that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable. This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests. This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size. I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank. If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution. However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
* | Merge branch 'master' into careminsterMelanie2012-07-131-3/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-131-3/+1
| | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
* | Merge branch 'avination' into careminsterMelanie2012-07-061-1/+3
|\ \ | |/ |/| | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Changed GetTexture error code RequestedRangeNotSatisfiable to NotFound, ↵UbitUmarov2012-07-061-1/+3
| | | | | | | | since viewers don't seem to handle that and keep retrying
generated by cgit v1.1 at 2024-12-29 00:33:40 +0000