aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove entities from updates queues on kill. Do it sync so enqueues afterUbitUmarov2014-08-231-0/+15
| | | | | | | | the kill work
| * add a direct sendpartfullUpdate to send a full object update to a part,UbitUmarov2014-08-211-0/+2
| | | | | | | | optionally overriding its parentID. check what it does to attachments
| * reserve updates priority queue 2 for attachments, send them by it onUbitUmarov2014-08-201-1/+3
| | | | | | | | | | | | BestAvatarResp scheme. Attachments cannot be sent on imediate queues, since they will block everything. Changed distance to priority math, keeping identical result, shifted to start at queue 3.
| * make webutilmore verbose on PUT for avatar updates. Reduce LargeTime debugUbitUmarov2014-08-171-2/+17
| | | | | | | | level to 500ms from 3000ms
| * remove duplication of textures, wearables and attachments on crossings.UbitUmarov2014-08-151-34/+49
| | | | | | | | receiver checks old method if it doesnt get packed appeareace
| * add a estimator of client ping time, and painfully make it visible in showUbitUmarov2014-08-141-0/+2
| | | | | | | | connections console command
| * *DANGER* dont send baked textures assets to Neighbours. Possible we couldUbitUmarov2014-08-141-3/+10
| | | | | | | | send a lot less
| * *DANGER* make baked textures cross and make use of it * UNTESTED *UbitUmarov2014-08-142-2/+75
| | | | | | | | issue: alll this seems to be sent back to childs, need to stop that
| * fix the damm thingUbitUmarov2014-08-121-6/+13
| |
| * Comment out stupid XEngine-bound message about script vs non-script startup, ↵Melanie Thielker2014-08-091-6/+6
| | | | | | | | it's annoyed me for a long time. Comment out periodic stats as well, they've never been useful to us and just cause console spew.
| * DANGER back to right current max number of wearables ( TP out of regionsUbitUmarov2014-08-081-3/+3
| | | | | | | | with this may kill old regions)
| * back to max 15 wearables until its safe ( and before i kill other gridUbitUmarov2014-08-081-3/+3
| | | | | | | | regions)
| * max 16 for testingUbitUmarov2014-08-071-3/+4
| |
| * add limites checks on wearables size, revert to max 15 forUbitUmarov2014-08-073-6/+19
| | | | | | | | compatibility/testing
| * update the max number of texture faces and wearables to current values.UbitUmarov2014-08-073-6/+12
| | | | | | | | This should be safe now..
| * DANGER... changed bakedtextures caching. Assuming grid baking is cacheUbitUmarov2014-08-071-1/+1
| | | | | | | | only, reduced number of accesses to it. TESTING
| * dont assume that all zero folded perms are to ignore ( coerence with oldUbitUmarov2014-08-051-2/+2
| | | | | | | | code in avn-current )
| * MESS: changes in MakeRootAgent and CompleteMovement reordering things.UbitUmarov2014-07-311-0/+2
| | | | | | | | | | | | Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :)
| * missing file in commit 5fe1f878372b5490304a2ad7c0a41293ae36aaa0UbitUmarov2014-07-301-1/+1
| |
| * Try to plumb the other halfMelanie Thielker2014-07-291-0/+3
| |
| * Send new parcel permissions to activate viewer options - done right this timeMelanie Thielker2014-07-291-10/+20
| |
| * change previus code, send a NoEvents response back to http server, evenUbitUmarov2014-07-241-3/+0
| | | | | | | | | | if we know there is no one there, so that the server finishes handling it.
| * let BlockingQueue timeout work as its suposed to and not wait for everUbitUmarov2014-07-241-3/+2
| |
| * request.DoHTTPGruntWork(..) is now identical to our version, so useUbitUmarov2014-07-231-40/+5
| | | | | | | | | | those again, getting code closer to os again
| * Merge branch 'avination-current'Melanie Thielker2014-07-191-1/+6
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| | * Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-165-7/+29
| | |\
| | * \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-082-319/+0
| | |\ \
| | * | | add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for now
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2182-663/+4118
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * | | Merge branch 'master' into careminsterMelanie2014-01-285-24/+70
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2014-01-282-1/+90
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ Intermediate commit. Sill errors.Melanie2014-01-055-37/+223
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| | * | | | | | Merge branch 'master' into careminsterMelanie2013-12-071-0/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-238-10/+34
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-081-1/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-035-0/+904
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-061-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | | * | | | | | | | | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| | * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-0613-14/+77
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-044-8/+35
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into careminsterMelanie2013-09-072-8/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-012-3/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-118-152/+363
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-079-20/+725
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-012-15/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-012-22/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-292-0/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-251-5/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
generated by cgit v1.1 at 2024-12-28 09:31:49 +0000