aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-1631-12079/+12101
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * minor: remove long commented out scene cache clearing code in ↵Justin Clark-Casey (justincc)2013-05-161-9/+0
| | | | | | | | EntityTransferModule.CrossAgentToNewRegionAsync()
| * minor: Remove completely unused IClientAPI.RequestClientInfo() call from ↵Justin Clark-Casey (justincc)2013-05-161-3/+0
| | | | | | | | EntityTransferModule.CrossAgentToNewRegionAsync()
| * Where this is not already happening, trigger asychoronous calls to ↵Justin Clark-Casey (justincc)2013-05-163-2/+3
| | | | | | | | | | | | | | CloseChildAgent() above the LocalSimulationConnector level. This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes). No functional change apart from elimination of unnecessary chaining of new threads.
| * On closing child agents, send separate asynchronous requests to each ↵Justin Clark-Casey (justincc)2013-05-163-9/+5
| | | | | | | | | | | | | | neighbour rather than sending all closes concurrently on a separate thread. This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time. This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
| * On logout, send close child agent requests to neighbours asynchronously, so ↵Justin Clark-Casey (justincc)2013-05-161-6/+3
| | | | | | | | | | | | user is not prevented from relogging if many neighbours are present but not responsive. The symptom here is that previous user connections are still present but are labelled active == false
| * fall back to using a display mesh for physics proxy if no physics_mesh entry ↵dahlia2013-05-151-0/+4
| | | | | | | | was wound in a mesh asset
| * Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686bLatif Khalifa2013-05-167-11955/+11955
| |
| * Removed obsolete libopenmetaverse fileLatif Khalifa2013-05-161-57/+0
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-151-0/+3
| |\
| | * Eliminate race condition where SimStatsReporter starts reportingRobert Adams2013-05-141-0/+3
| | | | | | | | | | | | stats before the region is completely initialized.
| * | Fix issue where osMakeNotecard() would fail if given a list containing ↵Justin Clark-Casey (justincc)2013-05-151-30/+30
| |/ | | | | | | | | | | vectors or quaternions. http://opensimulator.org/mantis/view.php?id=6640
| * Comment out log message about looking for asset data in remove asset service ↵Justin Clark-Casey (justincc)2013-05-141-1/+1
| | | | | | | | for now, in order to reduce log levels in a test region with many hg origin avatars
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-142-1/+8
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-141-2/+5
| | |\
| | * | Second take at HGTP-mesh bug: delay sending the initial data only for agents ↵Diva Canto2013-05-142-1/+8
| | | | | | | | | | | | | | | | that are coming via TP (root agents)
| * | | Comment out some debugging item permission messages since these are highly ↵Justin Clark-Casey (justincc)2013-05-141-3/+3
| | |/ | |/| | | | | | | | | | | | | noisy on the console. Please re-enable when required
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-142-3/+3
| |\ \ | | |/
| | * Revert "HGTP-mesh bug: the mesh download requests were going to the ↵Diva Canto2013-05-142-3/+3
| | | | | | | | | | | | | | | | | | departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!" This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
| * | BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while ↵Vegaslon2013-05-141-2/+5
| |/ | | | | | | | | | | you are running. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-144-7/+44
| |\
| | * BulletSim: add a lock to try and catch a native shape creation/destructionRobert Adams2013-05-131-2/+7
| | | | | | | | | | | | race condition.
| | * BulletSim: add adjustment for avatar capsule height scaling. MakesRobert Adams2013-05-132-4/+32
| | | | | | | | | | | | avatar standing on ground view better and enables tuning.
| | * BulletSim: use heightmap terrain when using BulletXNA.Robert Adams2013-05-132-1/+5
| | | | | | | | | | | | Output messages on features disabled when using BulletXNA.
| * | HGTP-mesh bug: the mesh download requests were going to the departing sims ↵Diva Canto2013-05-142-3/+3
| |/ | | | | | | for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
| * Fixed mantis #6609 -- LoadPlugin error messages on Robust.Diva Canto2013-05-135-7/+26
| |
| * Groups: Improve error handling on remote connector.Diva Canto2013-05-131-4/+9
| |
| * Fixes mantis #6636 -- GroupsDiva Canto2013-05-132-1/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-05-124-38/+50
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵Diva Canto2013-05-113-54/+19
| | | | | | | | about who has permission to set home where.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-116-5/+66
| |\
| * | Handle SetHome properlyDiva Canto2013-05-111-0/+59
| | |
| * | Delete debug messageDiva Canto2013-05-101-1/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-1127-139/+206
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-1124-134/+191
| |\ \
| | * | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
| | |/ | | | | | | | | | | | | is in a region. This fixes the high CPU usage for regions with nothing else going on.
| | * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| | |
| | * minor: Remove unnecessary code that was generating warning in ↵Justin Clark-Casey (justincc)2013-05-091-2/+2
| | | | | | | | | | | | TestXInventoryDataPlugin
| | * minor: Remove mono compiler warning in RemoteAdminPluginJustin Clark-Casey (justincc)2013-05-091-1/+1
| | |
| | * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | | | | | | | | | | | | | | This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction. This looks to address http://opensimulator.org/mantis/view.php?id=6600
| | * Only send one kill object to the deleter when they derez an object rather ↵Justin Clark-Casey (justincc)2013-05-092-17/+12
| | | | | | | | | | | | | | | | | | than two. Extend regression test to check this.
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-098-14/+11
| | |
| | * Fix issue where objects removed via llDie() would not disappear for users ↵Justin Clark-Casey (justincc)2013-05-098-88/+102
| | | | | | | | | | | | | | | | | | | | | | | | looking in from neighbouring sims. This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason. Added regression test for this case. This fixes http://opensimulator.org/mantis/view.php?id=6627
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-094-2/+37
| | |\
| | | * Application support:BlueWall2013-05-094-2/+37
| | | | | | | | | | | | | | | | Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
| | * | minor: Simplify test setup in SceneObjectDeRezTests since permissions module ↵Justin Clark-Casey (justincc)2013-05-091-10/+4
| | |/ | | | | | | | | | doesn't need different configuration anymore
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-115-3/+60
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-0810-11/+208
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Guard the scene list when estates are updatedMelanie2013-05-082-9/+14
| |
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-088-15/+174
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
generated by cgit v1.1 at 2024-12-23 18:16:33 +0000