OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
25,246 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

25246 Commits (9bf3e2a25745000fc9113c4b00f280fa67460601)

Author SHA1 Message Date
Melanie 2ea41718de Merge commit 'a087dbed7f57f3ec431782dd51ba43110a0f4ae3' into careminster 2013-05-25 02:00:15 +01:00
Melanie 2b87fb73a9 Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminster 2013-05-25 02:00:02 +01:00
Melanie 0086c3b5fb Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency 
This will require all money modules to be refactored!
 2013-05-25 01:58:50 +02:00
Robert Adams 1821372634 Meshmerizer: remember to add the copied hull verts to the list of hulls. 2013-05-24 16:32:19 -07:00
Robert Adams 5f1f5ea5ab BulletSim: add VehicleInertiaFactor to allow modifying inertia. 
Another parameter for vehicle operation tuning.
Default to <1,1,1> which means nothing is different under normal use.
 2013-05-24 16:24:16 -07:00
Robert Adams 4979940def BulletSim: properly set mesh hash key in use tracking structure. 
Shouldn't see any functional difference.
 2013-05-24 16:23:10 -07:00
Robert Adams 81a6c39781 Meshmerizer: add INI parameter to enable DEBUG mesh detail logging. 
Default to off.
To turn mesh parsing DEBUG detail logging on, add
    [Mesh]
        LogMeshDetail=true
to the INI file.
 2013-05-24 16:20:26 -07:00
Mic Bowman a087dbed7f One more appearance change: drop sending the SendAppearance packet 
to avatar when it becomes root. This packet shows up in the viewer
logs as an error and appears to cause problems for completing the
texture rebake process for v1 viewers in some cases.
 2013-05-24 13:26:07 -07:00
Mic Bowman bb0ea25090 Protect one more update of the baked texture hashes. 2013-05-24 13:25:25 -07:00
Mic Bowman 681fbda4b6 This is an experimental patch that adds support for comparing texture 
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
 2013-05-24 13:18:16 -07:00
dahlia 440905ad14 change a hull debugging message to Debug instead of Info 2013-05-24 10:31:14 -07:00
dahlia 21a3a81c7a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-24 01:54:28 -07:00
dahlia 0cdea5c2f3 correct some errors in decoding of mesh asset convex decomposition data 2013-05-24 01:53:37 -07:00
Melanie e2e839a0cd Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
 2013-05-24 01:11:49 +01:00
Justin Clark-Casey (justincc) eb2bd9d203 minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() 
As a struct, Vector3 has already been cloned by MemberwiseClone()
 2013-05-24 00:46:58 +01:00
Melanie 09c2cd0d76 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-05-24 00:45:08 +01:00
Justin Clark-Casey (justincc) 02fe05f346 Fix issue where llSetPayPrice on either one of a clone prim in the same 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
 2013-05-24 00:41:47 +01:00
Melanie 027580935a Reset "Show in search" on parcels cut off other parcels that are in search 2013-05-24 01:09:07 +02:00
Justin Clark-Casey (justincc) e597a7d94e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-23 23:53:44 +01:00
Justin Clark-Casey (justincc) 9b56f99326 Fix bug where a cloned object would report the wrong llGetNumberOfPrims() 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
 2013-05-23 23:52:07 +01:00
dahlia d90d8e9999 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-23 15:48:47 -07:00
dahlia c5549d2730 add decoder for bounding convex hull 2013-05-23 15:47:47 -07:00
Melanie 9ba35c6b7e Port fix from justicc - decouple pay prices on drag-copied prims 2013-05-24 00:45:30 +02:00
Justin Clark-Casey (justincc) 0d5566e879 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-23 23:07:46 +01:00
Justin Clark-Casey (justincc) 28548ab347 Fix bug where both ordinary UserManagementModule and HGUserManagementModules 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.
 2013-05-23 23:05:56 +01:00
Robert Adams 0e002e3693 Add DEBUG level logging in Meshmerizer for mesh parsing. There is 
a compile time variable to turn this logging off if it is too spammy.
 2013-05-23 14:41:05 -07:00
Robert Adams 29b3b44fab BulletSim: add locking around Meshmerizer use to eliminate possible race 
condition when extracting the convex hulls.
 2013-05-23 14:40:16 -07:00
Robert Adams 5efce21abc BulletSim: correct errors caused by misspelled INI parameter spec. 
Add debugging messages for hull asset use.
 2013-05-22 21:57:07 -07:00
Robert Adams f490522082 BulletSim: specify directory for OpenSim.Region.Physics.Meshing 
DLL file in prebuild.xml since that file ends up in bin/Physics
directory.
 2013-05-22 21:09:37 -07:00
Robert Adams ffc9b3dda7 BulletSim: add code to experimentally use asset hull data. 
Default to 'off' as it needs debugging.
 2013-05-22 21:01:00 -07:00
Robert Adams 61cdf9390d BulletSim: fix problem with walking up stairs that are oriented 
in certain directions. The problem was really that the avatar capsule
orientation was being set incorrectly.
 2013-05-22 16:06:06 -07:00
Melanie 4cb7ee47f2 Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in.... 2013-05-22 23:49:34 +02:00
Justin Clark-Casey (justincc) 7d38f4940c Implement llSetSoundQueueing(). 
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
 2013-05-22 20:01:57 +01:00
Robert Adams 6596a1de80 Revert "BulletSim: add code to experimentally use asset hull data." 
This reverts commit 2fd8819a04.

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.
 2013-05-21 22:16:18 -07:00
Robert Adams 10097f13aa BulletSim: update DLLs and SOs with version containing gImpact code. 2013-05-21 21:40:26 -07:00
Robert Adams 2fd8819a04 BulletSim: add code to experimentally use asset hull data. 
Default to 'off' as it needs debugging.
 2013-05-21 21:32:30 -07:00
Robert Adams 9de3979f5b BulletSim: add gImpact shape type. Add logic to use gImpact shape 
for prims that have cuts or holes. Default logic to 'off' as it
needs debugging.
 2013-05-21 15:32:10 -07:00
Robert Adams ece7b33a96 Merge branch 'master' of git://opensimulator.org/git/opensim 2013-05-21 15:31:13 -07:00
Justin Clark-Casey (justincc) 06ab168897 To further help with tracking down the apperance of too much "Unknown User" 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
 2013-05-21 22:26:15 +01:00
Justin Clark-Casey (justincc) ba6a6b2d40 Fix compile failure from recent git master 434c3cf 2013-05-21 18:18:16 +01:00
Justin Clark-Casey (justincc) 434c3cf83b Make "show name" command display HomeURL like "show names" 2013-05-21 18:15:22 +01:00
Justin Clark-Casey (justincc) 5c8d38d6cf minor: Change "show names" command to use consistent console display table 2013-05-21 18:11:07 +01:00
Justin Clark-Casey (justincc) 6edecd5d94 Add "show name" console command to make it possible to show a single binding of a UUID to a name. 2013-05-21 18:00:41 +01:00
Justin Clark-Casey (justincc) c47de9878d Log when "Unknown User" is sent to a user because the UMM had no binding for 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
 2013-05-21 17:45:15 +01:00
Justin Clark-Casey (justincc) 6ae426c96b Lock m_UserCache whilst iterating over it in UserManagementModule.GetUserData() to avoid concurrency exceptions 2013-05-21 17:25:06 +01:00
Diva Canto 10e4fb2ce2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-20 09:26:15 -07:00
Diva Canto 26904cc5a1 Add comment 2013-05-20 09:25:50 -07:00
dahlia e65d1e459e fix error in hull point indexing 2013-05-18 13:11:22 -07:00
dahlia 477bee6468 remove duplicate hull scaling 2013-05-18 11:15:05 -07:00
dahlia fa8f5bafb2 add prototype code to decode convex hulls from mesh assets. Please do not use yet; the interface will be defined in a later commit. 2013-05-18 01:23:09 -07:00