Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "BulletSim: add code to experimentally use asset hull data." | Robert Adams | 2013-05-21 | 3 | -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 Adams | 2013-05-21 | 4 | -0/+0 |
| | |||||
* | BulletSim: add code to experimentally use asset hull data. | Robert Adams | 2013-05-21 | 3 | -4/+55 |
| | | | | Default to 'off' as it needs debugging. | ||||
* | BulletSim: add gImpact shape type. Add logic to use gImpact shape | Robert Adams | 2013-05-21 | 7 | -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/opensim | Robert Adams | 2013-05-21 | 5 | -59/+203 |
|\ | |||||
| * | To further help with tracking down the apperance of too much "Unknown User" ↵ | Justin Clark-Casey (justincc) | 2013-05-21 | 4 | -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 434c3cf | Justin Clark-Casey (justincc) | 2013-05-21 | 1 | -1/+1 |
| | | |||||
| * | Make "show name" command display HomeURL like "show names" | Justin Clark-Casey (justincc) | 2013-05-21 | 1 | -4/+11 |
| | | |||||
| * | minor: Change "show names" command to use consistent console display table | Justin Clark-Casey (justincc) | 2013-05-21 | 1 | -15/+9 |
| | | |||||
| * | Add "show name" console command to make it possible to show a single binding ↵ | Justin Clark-Casey (justincc) | 2013-05-21 | 1 | -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-21 | 1 | -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-21 | 1 | -4/+9 |
| | | | | | | | | UserManagementModule.GetUserData() to avoid concurrency exceptions | ||||
| * | fix error in hull point indexing | dahlia | 2013-05-18 | 1 | -1/+1 |
| | | |||||
| * | remove duplicate hull scaling | dahlia | 2013-05-18 | 1 | -3/+3 |
| | | |||||
| * | add prototype code to decode convex hulls from mesh assets. Please do not ↵ | dahlia | 2013-05-18 | 1 | -21/+110 |
| | | | | | | | | use yet; the interface will be defined in a later commit. | ||||
* | | BulletSim: fix BulletSim crashing if there is no [BulletSim] section | Robert Adams | 2013-05-17 | 2 | -8/+12 |
|/ | | | | in any INI file. Update TODO list. | ||||
* | minor: remove long commented out scene cache clearing code in ↵ | Justin Clark-Casey (justincc) | 2013-05-16 | 1 | -9/+0 |
| | | | | EntityTransferModule.CrossAgentToNewRegionAsync() | ||||
* | minor: Remove completely unused IClientAPI.RequestClientInfo() call from ↵ | Justin Clark-Casey (justincc) | 2013-05-16 | 1 | -3/+0 |
| | | | | EntityTransferModule.CrossAgentToNewRegionAsync() | ||||
* | Where this is not already happening, trigger asychoronous calls to ↵ | Justin Clark-Casey (justincc) | 2013-05-16 | 3 | -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-16 | 3 | -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-16 | 1 | -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 ↵ | dahlia | 2013-05-15 | 1 | -0/+4 |
| | | | | was wound in a mesh asset | ||||
* | Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b | Latif Khalifa | 2013-05-16 | 7 | -11955/+11955 |
| | |||||
* | Removed obsolete libopenmetaverse file | Latif Khalifa | 2013-05-16 | 1 | -57/+0 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-15 | 1 | -0/+3 |
|\ | |||||
| * | Eliminate race condition where SimStatsReporter starts reporting | Robert Adams | 2013-05-14 | 1 | -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-15 | 1 | -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-14 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2013-05-14 | 2 | -1/+8 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-14 | 1 | -2/+5 |
| |\ | |||||
| * | | Second take at HGTP-mesh bug: delay sending the initial data only for agents ↵ | Diva Canto | 2013-05-14 | 2 | -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-14 | 1 | -3/+3 |
| |/ |/| | | | | | | | | | noisy on the console. Please re-enable when required | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-05-14 | 2 | -3/+3 |
|\ \ | |/ | |||||
| * | Revert "HGTP-mesh bug: the mesh download requests were going to the ↵ | Diva Canto | 2013-05-14 | 2 | -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 ↵ | Vegaslon | 2013-05-14 | 1 | -2/+5 |
|/ | | | | | | you are running. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-14 | 4 | -7/+44 |
|\ | |||||
| * | BulletSim: add a lock to try and catch a native shape creation/destruction | Robert Adams | 2013-05-13 | 1 | -2/+7 |
| | | | | | | | | race condition. | ||||
| * | BulletSim: add adjustment for avatar capsule height scaling. Makes | Robert Adams | 2013-05-13 | 2 | -4/+32 |
| | | | | | | | | avatar standing on ground view better and enables tuning. | ||||
| * | BulletSim: use heightmap terrain when using BulletXNA. | Robert Adams | 2013-05-13 | 2 | -1/+5 |
| | | | | | | | | Output messages on features disabled when using BulletXNA. | ||||
* | | HGTP-mesh bug: the mesh download requests were going to the departing sims ↵ | Diva Canto | 2013-05-14 | 2 | -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 Canto | 2013-05-13 | 5 | -7/+26 |
| | |||||
* | Groups: Improve error handling on remote connector. | Diva Canto | 2013-05-13 | 1 | -4/+9 |
| | |||||
* | Fixes mantis #6636 -- Groups | Diva Canto | 2013-05-13 | 2 | -1/+7 |
| | |||||
* | Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵ | Diva Canto | 2013-05-11 | 3 | -54/+19 |
| | | | | about who has permission to set home where. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-11 | 6 | -5/+66 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-05-11 | 24 | -134/+191 |
| |\ | |||||
| | * | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie | Robert Adams | 2013-05-10 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | is in a region. This fixes the high CPU usage for regions with nothing else going on. | ||||
| * | | Send up the part missing from the Avination Estate commit. | Melanie | 2013-05-11 | 5 | -3/+60 |
| | | | | | | | | | | | | Warning - contains a small migration. | ||||
* | | | Handle SetHome properly | Diva Canto | 2013-05-11 | 1 | -0/+59 |
| | | | |||||
* | | | Delete debug message | Diva Canto | 2013-05-10 | 1 | -1/+0 |
| |/ |/| |