aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'avination' into careminsterMelanie2012-06-021-19/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-311-18/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-131-1/+21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | backkick gitUbitUmarov2012-07-151-1/+0
| | | | | | | | | | |
* | | | | | | | | | | merge fixubit2012-07-161-15/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | just a kick gitUbitUmarov2012-07-151-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-23/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | | | | | | Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-2/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | | | | | | Testing changes and instrumentationMelanie2012-07-151-3/+20
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-151-0/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | | | | | | Save packets received while the client is added and replay them later.Melanie2012-07-151-0/+34
| | | | | | | | | |
| * | | | | | | | | Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e3fa73da96f5612da52d140425f1633494d6edef.
| * | | | | | | | | Experimentally handle UseCircuitCode synchrnonouslyMelanie2012-07-151-1/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | to stashubit2012-07-151-2/+2
|/ / / / / / / /
* | | | | | | | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's timeout
* | | | | | | | in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem ↵UbitUmarov2012-06-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing
* | | | | | | | coment out some of previus debug messaged before forgetting about them...UbitUmarov2012-06-221-2/+2
| | | | | | | |
* | | | | | | | more debugUbitUmarov2012-06-221-0/+3
| | | | | | | |
* | | | | | | | i more debugUbitUmarov2012-06-221-1/+1
| | | | | | | |
* | | | | | | | add a temp debug messageUbitUmarov2012-06-221-0/+3
| | | | | | | |
* | | | | | | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-071-4/+29
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | up the sound pipeline in the viewer.
* | | | | | | Remove the kill record. Core has removed it long ago and it really does more ↵Melanie2012-06-011-19/+19
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | harm than good these days
* | | | | | Fix the log standing attach-from-world bug.Melanie2012-05-301-18/+32
| |_|_|_|/ |/| | | |
* | | | | 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).
* | | | ª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
* | | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-071-4/+2
|/ /
* | 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
generated by cgit v1.1 at 2024-10-25 22:33:43 +0000