| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminster | Melanie | 2013-05-25 | 1 | -53/+83 |
| |\ | |||||
| | * | change a hull debugging message to Debug instead of Info | dahlia | 2013-05-24 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2013-05-24 | 2 | -1/+2 |
| | |\ | |||||
| | * | | correct some errors in decoding of mesh asset convex decomposition data | dahlia | 2013-05-24 | 1 | -53/+83 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-24 | 6 | -156/+244 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | ||||
| | * | | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() | Justin Clark-Casey (justincc) | 2013-05-24 | 1 | -1/+0 |
| | | | | | | | | | | | | | As a struct, Vector3 has already been cloned by MemberwiseClone() | ||||
| | * | | Fix issue where llSetPayPrice on either one of a clone prim in the same ↵ | Justin Clark-Casey (justincc) | 2013-05-24 | 1 | -0/+2 |
| | |/ | | | | | | | | | | | | | OpenSimulator session would change the prices on both prims. This is because the PayPrice array refernence was being memberwise cloned and not the array itself. Addresses http://opensimulator.org/mantis/view.php?id=6639 | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-23 | 1 | -4/+53 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2013-05-23 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | add decoder for bounding convex hull | dahlia | 2013-05-23 | 1 | -4/+53 |
| | | | | | |||||
| | * | | | Fix bug where a cloned object would report the wrong llGetNumberOfPrims() ↵ | Justin Clark-Casey (justincc) | 2013-05-23 | 1 | -0/+1 |
| | | |/ | |/| | | | | | | | | | | | | | | | | when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session. This was because the sitting avatars list was being cloned rather than reset. Addresses http://opensimulator.org/mantis/view.php?id=6649 | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-23 | 5 | -114/+210 |
| | |\ \ | | |/ | |||||
| | | * | Add DEBUG level logging in Meshmerizer for mesh parsing. There is | Robert Adams | 2013-05-23 | 1 | -2/+25 |
| | | | | | | | | | | | | | a compile time variable to turn this logging off if it is too spammy. | ||||
| | | * | BulletSim: add locking around Meshmerizer use to eliminate possible race | Robert Adams | 2013-05-23 | 1 | -145/+157 |
| | | | | | | | | | | | | | condition when extracting the convex hulls. | ||||
| | | * | BulletSim: correct errors caused by misspelled INI parameter spec. | Robert Adams | 2013-05-22 | 2 | -4/+7 |
| | | | | | | | | | | | | | Add debugging messages for hull asset use. | ||||
| | * | | Fix bug where both ordinary UserManagementModule and HGUserManagementModules ↵ | Justin Clark-Casey (justincc) | 2013-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | were being added to scenes if no UserManagementModule was specified. Without explicit config non-hg UMM is used - this is in common with other HG modules. This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-24 | 23 | -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.Meshing | Robert Adams | 2013-05-22 | 1 | -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 Adams | 2013-05-22 | 3 | -4/+55 |
| | | | | | | | | | | | | | Default to 'off' as it needs debugging. | ||||
| | * | | BulletSim: fix problem with walking up stairs that are oriented | Robert Adams | 2013-05-22 | 1 | -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-22 | 4 | -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 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. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-05-16 | 31 | -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-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 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |