aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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-0813-241/+1231
| |\ \
| | * | 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-075-8/+14
| | |\ \ \
| | | * | | 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
* | | | | Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminsterMelanie2013-06-080-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Supply proper type information for the various types of requestsMelanie2013-06-073-9/+8
| * | | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-079-236/+220
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-06-075-8/+10
|\ \ \ \ | |/ / /
| * | | minor: add dr0berts to contributors listJustin Clark-Casey (justincc)2013-06-071-2/+3
| * | | Fix regression where multiple close agents could be sent to the wrong neighbo...Justin Clark-Casey (justincc)2013-06-071-1/+6
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-072-4/+27
| |\ \ \ | | |/ /
| | * | Mantis #6620 (removed debug message)Diva Canto2013-06-071-1/+1
| * | | In LocalFriendshipTerminated, send the original client's agentId to the frien...Donnie Roberts2013-06-072-4/+4
* | | | Merge branch 'master' into careminsterMelanie2013-06-062-3/+31
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-061-0/+5
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0513-4/+261
| | |\ \
| | * | | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
| * | | | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| | |/ / | |/| |
* | | | Merge branch 'avination-current' into careminsterMelanie2013-06-0629-52/+559
|\ \ \ \ | | |_|/ | |/| |
| * | | Update HTTP serverMelanie2013-06-041-0/+0