aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-05-311-18/+32
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fix the log standing attach-from-world bug.Melanie2012-05-301-18/+32
| |
* | Merge branch 'master' into careminsterMelanie2012-05-191-39/+61
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| | |
| * | Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| | | | | | | | | | | | Refactor: eq message logging into common method.
| * | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-181-20/+33
| | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
* | | Merge branch 'avination' into careminsterMelanie2012-05-171-2/+8
|\ \ \ | | |/ | |/|
| * | udp transfer: make number packets estimation coerent with number actually ↵UbitUmarov2012-05-171-2/+8
| | | | | | | | | | | | sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
* | | Merge branch 'avination' into careminsterMelanie2012-05-131-1/+21
|\ \ \ | |/ /
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-121-1/+21
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-102-6/+9
|\ \ \ | | |/ | |/|
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-092-6/+9
| | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | | Merge branch 'avination' into careminsterMelanie2012-05-081-4/+2
|\ \ \ | | |/ | |/|
| * | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-071-4/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-0512-80/+138
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-0312-80/+137
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'master' into careminsterMelanie2012-05-022-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-012-2/+3
| | | | | | | | | | | | | | | | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
| * | Revert "Revert "Implement bulk inventory update over CAPS (not recursive by ↵Justin Clark-Casey (justincc)2012-04-271-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | design,"" This reverts commit a90b0e302c110068cec0ee7109e796d2d5fdab4d. Sorry, accidentally reverted this completely by mistake, reverting the revert.
| * | Revert "Implement bulk inventory update over CAPS (not recursive by design,"Justin Clark-Casey (justincc)2012-04-271-47/+1
| | | | | | | | | | | | This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
* | | Merge branch 'master' into careminsterMelanie2012-04-275-6/+13
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-273-3/+3
| | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| * Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-261-1/+3
| | | | | | | | problem resolution.
| * minor: Add more detail to unauthorized caps client messageJustin Clark-Casey (justincc)2012-04-261-1/+4
| |
| * minor: Add region name to dropped inbound packet messageJustin Clark-Casey (justincc)2012-04-261-1/+3
| |
* | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-1/+1
| | | | | | | | more lobe ?
* | Merge branch 'master' into careminsterMelanie2012-04-071-3/+4
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Rather than having a FromFolderID property on every single prim and only ↵Justin Clark-Casey (justincc)2012-04-071-1/+1
| | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage.
| * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-071-1/+1
| | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
| * Packing of folder in SendBulkUpdateInventory always set the folder type to ↵Diva Canto2012-04-061-1/+2
| | | | | | | | -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
| * Implement bulk inventory update over CAPS (not recursive by design,Melanie2012-03-311-1/+47
| | | | | | | | do NOT CHANGE THIS, needed for HG 2.0)
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-311-1/+47
|\ \ | | | | | | | | | careminster
| * | Implement bulk inventory update over CAPS (not recursive by design,Melanie2012-03-311-1/+47
| | | | | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0)
* | | Merge branch 'master' into careminsterMelanie2012-03-311-7/+6
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-291-7/+6
| | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
| * Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-291-2/+2
| | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents.
| * Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-291-2/+2
| | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
* | Merge branch 'master' into careminsterMelanie2012-03-291-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Simplify friends caching by only doing this for root agents - no functions ↵Justin Clark-Casey (justincc)2012-03-281-2/+2
| | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting.
| * Typo fixMelanie2012-03-281-1/+1
| |
* | Typo fixMelanie2012-03-281-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-281-2/+2
|\ \ | |/
| * Fix typosMelanie2012-03-281-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-03-281-0/+48
|\ \ | |/
| * Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-281-0/+48
| |
* | Merge branch 'master' into careminsterMelanie2012-03-281-0/+38
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * Add a corresponding method for items. HG v2Melanie2012-03-281-0/+38
| |
| * Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-1/+40
| | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
* | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-1/+40
| | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
* | Merge branch 'master' into careminsterMelanie2012-03-272-20/+58
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-12-29 01:46:58 +0000