Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | On to 0.8.3! | Diva Canto | 2015-10-18 | 1 | -1/+1 |
| | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | ||||
* | Also restoring proper function for Simian external GetTexture functionality. | Diva Canto | 2015-10-14 | 1 | -6/+5 |
| | |||||
* | change copyright to opensim | UbitUmarov | 2015-09-28 | 1 | -3/+27 |
| | |||||
* | try to better merge avn and os fetchinventory and fetchinvdescendents | UbitUmarov | 2015-09-12 | 1 | -2/+2 |
| | |||||
* | inventory mess return to the state before divas cache issue | UbitUmarov | 2015-09-11 | 2 | -43/+122 |
| | |||||
* | change to avn fecthinventory and webfecth.. code | UbitUmarov | 2015-09-11 | 2 | -122/+43 |
| | |||||
* | at last we can login and see objects ( friends is dead and disable in | UbitUmarov | 2015-09-03 | 4 | -13/+8 |
| | | | | scenepresence) | ||||
* | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 10 | -435/+38 |
| | |||||
* | bad merge? | UbitUmarov | 2015-09-01 | 12 | -805/+2765 |
|\ | |||||
| * | change osd encoding of region size | UbitUmarov | 2015-08-27 | 1 | -8/+8 |
| | | |||||
| * | turn off KeepAlive | UbitUmarov | 2015-08-24 | 2 | -5/+5 |
| | | |||||
| * | Merge branch 'mbworkvar2' into ubitvar | UbitUmarov | 2015-08-19 | 1 | -4/+5 |
| |\ | |||||
| | * | varregion: remove use of Constants.RegionSize is various places. | Robert Adams | 2015-03-28 | 1 | -4/+5 |
| | | | | | | | | | | | | More use of the Util routines for conversion of region handles into addresses. | ||||
| * | | add a Retry-After response header to the 503 sent when we are 2 busy to do | UbitUmarov | 2015-08-19 | 1 | -0/+5 |
| | | | | | | | | | | | | the request. just 503 could mean server down (?) | ||||
| * | | do keepalive on mesh and texture GET. Dont use reusecontext any where. | UbitUmarov | 2015-08-18 | 2 | -5/+5 |
| |/ | | | | | | | | | | | setting of keepalive is wrong, it should follow the requested one ( or always as http1.1) only deny if needed (errors). KeepAlive may increase stress on number of avaiable file descritors. | ||||
| * | move AnimationSet and AvatarSkeleton to OpenSimExtras | UbitUmarov | 2014-10-12 | 1 | -5/+7 |
| | | |||||
| * | add simulator features AvatarSkeleton and AnimationSet report | UbitUmarov | 2014-10-11 | 1 | -1/+4 |
| | | |||||
| * | changed skeleton, do parse the mesh on upload to check skeleton. Sooner or | UbitUmarov | 2014-10-11 | 2 | -26/+26 |
| | | | | | | | | later this parsing needs to validate the model cost also. | ||||
| * | dont let test mesh go to meshes inventory folder that is not displayed by | UbitUmarov | 2014-10-11 | 1 | -1/+3 |
| | | | | | | | | viewers | ||||
| * | bug fix | UbitUmarov | 2014-10-11 | 1 | -2/+3 |
| | | |||||
| * | check for avatar skeleton data on meshs headers on cost estimation. Dont | UbitUmarov | 2014-10-11 | 2 | -11/+101 |
| | | | | | | | | | | | | | | let a model have more than one mesh with skeleton, for testing create a mesh inventory item, for this meshs. Add also option to read a avatar collider replacement. This information still needs to be saved somewhere so it can be checked on attachment, etc, without parsing the mesh asset again. | ||||
| * | change it again... | UbitUmarov | 2014-09-26 | 1 | -1/+1 |
| | | |||||
| * | remove unnecessary argument ref | UbitUmarov | 2014-09-26 | 1 | -1/+1 |
| | | |||||
| * | make c# more happy | UbitUmarov | 2014-09-26 | 1 | -4/+1 |
| | | |||||
| * | use central animationset permitions define | UbitUmarov | 2014-09-26 | 1 | -2/+2 |
| | | |||||
| * | Extend upload verification to all upload paths | Melanie Thielker | 2014-09-25 | 1 | -0/+8 |
| | | |||||
| * | fix animation asset name to "animatn", use "animset" for the new | UbitUmarov | 2014-09-25 | 1 | -8/+10 |
| | | | | | | | | animationSet | ||||
| * | add also the name animset until its clear the name liru will use | UbitUmarov | 2014-09-25 | 1 | -0/+7 |
| | | |||||
| * | add animationset to upload assets, for now no cost | UbitUmarov | 2014-09-25 | 1 | -0/+6 |
| | | |||||
| * | make use of it in GetMeshModule, and meshs are Assets not Task itens, | UbitUmarov | 2014-08-29 | 1 | -43/+4 |
| | | | | | | | | reduce MeshModule impact on udp rate | ||||
| * | also on other case | UbitUmarov | 2014-08-09 | 1 | -0/+11 |
| | | |||||
| * | return even zero costs ( prims on other regions ) | UbitUmarov | 2014-08-09 | 1 | -1/+1 |
| | | |||||
| * | move from RegisterInventoryServiceHandlers to | UbitUmarov | 2014-08-09 | 1 | -9/+14 |
| | | | | | | | | RegisterRegionServiceHandlers what belongs there ( readabilitly only ) | ||||
| * | DANGER... changed bakedtextures caching. Assuming grid baking is cache | UbitUmarov | 2014-08-07 | 1 | -68/+56 |
| | | | | | | | | only, reduced number of accesses to it. TESTING | ||||
| * | bakemodule didnt like last changes | UbitUmarov | 2014-08-06 | 1 | -5/+3 |
| | | |||||
| * | some debug to remove later | UbitUmarov | 2014-08-06 | 1 | -0/+6 |
| | | |||||
| * | comment out a debug msg. more on gods being Gods | UbitUmarov | 2014-08-03 | 1 | -1/+1 |
| | | |||||
| * | add queue transition code needs review/more testing | UbitUmarov | 2014-07-25 | 1 | -79/+115 |
| | | |||||
| * | remove old and dead code that its only making it hard to understand | UbitUmarov | 2014-07-25 | 1 | -287/+18 |
| | | |||||
| * | change previus code, send a NoEvents response back to http server, even | UbitUmarov | 2014-07-24 | 1 | -2/+1 |
| | | | | | | | | | | if we know there is no one there, so that the server finishes handling it. | ||||
| * | EventQueueGetModule: dont reuse queues, we dont know whats there; make | UbitUmarov | 2014-07-24 | 1 | -10/+9 |
| | | | | | | | | | | | | pool silently loose requests for unknown avatars, or they will stay active until timeout after close ( possible not a big problem after not reusing queues ? ) | ||||
| * | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 2 | -22/+48 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs | ||||
| | * | varregion: Add region size to teleport event messages (EnableSimulator, | Robert Adams | 2014-01-04 | 2 | -19/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-12-07 | 1 | -0/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-11-08 | 2 | -6/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 4 | -23/+41 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * \ \ \ \ \ | Merge branch 'avination-current' into careminster | Melanie | 2013-09-16 | 1 | -23/+34 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | ||||
| | * | | | | | | Add support for simple external CAPS texture services | root | 2013-09-07 | 1 | -19/+31 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-09-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs |