aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-2423-91/+477
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: specify directory for OpenSim.Region.Physics.MeshingRobert Adams2013-05-221-1/+1
| | | | | | | | | | DLL file in prebuild.xml since that file ends up in bin/Physics directory.
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-223-4/+55
| | | | | | | | Default to 'off' as it needs debugging.
| * BulletSim: fix problem with walking up stairs that are orientedRobert Adams2013-05-221-2/+9
| | | | | | | | | | in certain directions. The problem was really that the avatar capsule orientation was being set incorrectly.
| * Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-224-6/+33
| | | | | | | | | | | | This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
| * Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-213-55/+4
| | | | | | | | | | | | | | | | This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e. Remove this code until I can figure out why the references that are clearly in prebuild.xml doesn't work for the 'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
| * BulletSim: update DLLs and SOs with version containing gImpact code.Robert Adams2013-05-214-0/+0
| |
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-213-4/+55
| | | | | | | | Default to 'off' as it needs debugging.
| * BulletSim: add gImpact shape type. Add logic to use gImpact shapeRobert Adams2013-05-217-14/+167
| | | | | | | | | | for prims that have cuts or holes. Default logic to 'off' as it needs debugging.
| * Merge branch 'master' of git://opensimulator.org/git/opensimRobert Adams2013-05-215-59/+203
| |\
| | * To further help with tracking down the apperance of too much "Unknown User" ↵Justin Clark-Casey (justincc)2013-05-214-6/+6
| | | | | | | | | | | | | | | | | | | | | in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials) This is to help with http://opensimulator.org/mantis/view.php?id=6625
| | * Fix compile failure from recent git master 434c3cfJustin Clark-Casey (justincc)2013-05-211-1/+1
| | |
| | * Make "show name" command display HomeURL like "show names"Justin Clark-Casey (justincc)2013-05-211-4/+11
| | |
| | * minor: Change "show names" command to use consistent console display tableJustin Clark-Casey (justincc)2013-05-211-15/+9
| | |
| | * Add "show name" console command to make it possible to show a single binding ↵Justin Clark-Casey (justincc)2013-05-211-0/+34
| | | | | | | | | | | | of a UUID to a name.
| | * Log when "Unknown User" is sent to a user because the UMM had no binding for ↵Justin Clark-Casey (justincc)2013-05-211-17/+32
| | | | | | | | | | | | | | | | | | | | | that UUID and when a binding replaces a previous "Unknown User" entry. This is a temporary measure to hunt down issues where some but not all users see others as "Unknown user" in text chat, etc. http://opensimulator.org/mantis/view.php?id=6625
| | * Lock m_UserCache whilst iterating over it in ↵Justin Clark-Casey (justincc)2013-05-211-4/+9
| | | | | | | | | | | | UserManagementModule.GetUserData() to avoid concurrency exceptions
| | * fix error in hull point indexingdahlia2013-05-181-1/+1
| | |
| | * remove duplicate hull scalingdahlia2013-05-181-3/+3
| | |
| | * add prototype code to decode convex hulls from mesh assets. Please do not ↵dahlia2013-05-181-21/+110
| | | | | | | | | | | | use yet; the interface will be defined in a later commit.
| * | BulletSim: fix BulletSim crashing if there is no [BulletSim] sectionRobert Adams2013-05-172-8/+12
| |/ | | | | | | in any INI file. Update TODO list.
* | 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
generated by cgit v1.1 at 2024-11-13 00:14:28 +0000