aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)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
| | | | | | | | right corner.
| * 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
| | | | | | | | of interaction issues causing client crashes.
| * 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
| | | | | | | | | | | | | | | | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active.
| * | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. ↵dahlia2013-06-111-0/+3
| | | | | | | | | | | | Addresses Mantis #0006671
| * | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization ↵dahlia2013-06-101-2/+2
| | | | | | | | | | | | fails
| * | 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 ↵dahlia2013-06-101-22/+6
| | | | | | | | | | | | normalizing. Also removed some excessive division and cleaned up a bit
* | | Merge branch 'master' into careminsterMelanie2013-06-1118-53/+1128
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | 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 ↵Justin Clark-Casey (justincc)2013-06-101-2/+2
| | | | | | | | | | | | belong to which HttpServer
| * | Reinstate explicit starting and stopping of PollServiceRequestManager added ↵Justin Clark-Casey (justincc)2013-06-102-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | in 3eee991 but removed in 7c0bfca Do not rely on destructors to stop things. These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503 and most probably http://opensimulator.org/mantis/view.php?id=6668
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | so error messages make more sense. Change some BulletSim status log messages from WARN to INFO. Update TODO list.
| * | | Fix test for adding temporary assets. Code for non-local temporary assetsMic Bowman2013-06-101-0/+20
| |/ / | | | | | | | | | is there but commented out.
| * | Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-104-3/+4
| | | | | | | | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
| * | Mantis 5346: llAxisAngle2Rot() should normalize before computingTalun2013-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Corrected to agree with http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes to normalise the vector before computing the quaternion Signed-off-by: dahlia <dahlia@nomail>
| * | 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
| | |\ \ | | | | | | | | | | | | | | | message to explain why this merge is necessary,
| | | * | 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 ↵Justin Clark-Casey (justincc)2013-06-071-1/+1
| | | |/ / | | | | | | | | | | | | | | | force selected and turn down to debug level
| | * | | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * | | 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 ↵Justin Clark-Casey (justincc)2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658
| * | | 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 ↵Donnie Roberts2013-06-072-4/+4
| | | | | | | | | | | | | | | | friend being removed instead of the friend's own id.
* | | | 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
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | | Update HTTP serverMelanie2013-06-041-0/+0
| | | |
generated by cgit v1.1 at 2024-12-14 19:54:06 +0000