aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-1318-181/+286
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-1215-122/+227
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-133-4/+8
| | |\
| | | * * This fixes having to select and deselect prim to get keyframemotion to star...teravus2013-06-123-4/+8
| | * | Make XInventoryServicesConnector properly handle a RESULT = false return for ...Justin Clark-Casey (justincc)2013-06-131-68/+56
| | |/
| | * After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistent...Justin Clark-Casey (justincc)2013-06-122-2/+24
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-126-20/+41
| | |\
| | | * BulletSim: when meshing or asset fetching fails, include positionRobert Adams2013-06-112-14/+30
| | | * Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-114-6/+11
| | * | Implement logging of first 80 characters (debug level 5) or full body data (d...Justin Clark-Casey (justincc)2013-06-122-5/+57
| | |/
| | * Uncomment Mic's code and split to create new regression TestAddTemporaryAsset...Justin Clark-Casey (justincc)2013-06-111-23/+41
| * | DataSnapshot: changed those annoying messages to Debug instead of Info.Diva Canto2013-06-122-8/+8
| |/
| * Removed the lock entirelyDiva Canto2013-06-111-56/+52
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-1113-74/+153
| |\
| | * Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | Really bad idea to lock m_UserCache for so long in UserManagementModule. Adde...Diva Canto2013-06-111-13/+17
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-115-332/+16
|\ \ \
| * | | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | | Explicitly set uploaded mesh object permsMelanie2013-06-101-10/+13
| * | | Make objects attached from the ground appear in inventory again. Fixes a numberMelanie2013-06-081-1/+1
| * | | Clean up poll serviceMelanie2013-06-072-319/+0
* | | | Merge branch 'master' into careminsterMelanie2013-06-115-15/+43
|\ \ \ \ | | |_|/ | |/| |
| * | | * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ...teravus2013-06-113-2/+35
| * | | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Add...dahlia2013-06-111-0/+3
| * | | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization f...dahlia2013-06-101-2/+2
| * | | llRot2Angle now checks absolute value of s rotation component before normalizingdahlia2013-06-101-11/+3
* | | | Merge branch 'master' into careminsterMelanie2013-06-111-22/+6
|\ \ \ \ | |/ / /
| * | | llRot2Axis now checks absolute value of s rotation component before normalizi...dahlia2013-06-101-22/+6
* | | | Merge branch 'master' into careminsterMelanie2013-06-1118-53/+1128
|\ \ \ \ | |/ / /
| * | | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669teravus2013-06-101-2/+4
| * | | add a Normalize() method for LSL_Rotationdahlia2013-06-101-0/+25
| * | | Add port numbers to poll service thread names so that we can tell which belon...Justin Clark-Casey (justincc)2013-06-101-2/+2
| * | | Reinstate explicit starting and stopping of PollServiceRequestManager added i...Justin Clark-Casey (justincc)2013-06-102-4/+7
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-06-104-34/+51
| |\ \ \
| | * | | BulletSim: add failure flag for meshing failure vs asset fetch failureRobert Adams2013-06-104-34/+51
| | | |/ | | |/|
| * | | Fix test for adding temporary assets. Code for non-local temporary assetsMic Bowman2013-06-101-0/+20
| |/ /
| * | Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-104-3/+4
| * | Mantis 5346: llAxisAngle2Rot() should normalize before computingTalun2013-06-101-0/+1
| * | More on mantis #6666 -- Groups V2 remote connector.Diva Canto2013-06-091-7/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0812-241/+1230
| |\ \
| | * | Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
| | * | Merge branch 'profiles'BlueWall2013-06-074-0/+998
| | |\ \
| | | * | SQLite support for UserProfilesBlueWall2013-06-073-0/+995
| | | * | Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
| * | | | Groups V2 -- fix mantis #6666Diva Canto2013-06-081-0/+3
* | | | | Merge branch 'master' into careminsterMelanie2013-06-082-1/+30
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-072-1/+30
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-074-6/+11
| | |\ \ \
| | | * | | minor: Comment out debug logging (at warn level) about number of objects forc...Justin Clark-Casey (justincc)2013-06-071-1/+1
| | | |/ /
| | * | | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29