aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)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 ↵teravus2013-06-123-4/+8
| | | | | | | | | | | | | | | | start running when pulled from data storage.
| | * | Make XInventoryServicesConnector properly handle a RESULT = false return for ↵Justin Clark-Casey (justincc)2013-06-131-68/+56
| | |/ | | | | | | | | | | | | | | | methods where this contains failure rather than throwing an exception. Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
| | * After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, ↵Justin Clark-Casey (justincc)2013-06-122-2/+24
| | | | | | | | | | | | | | | | | | | | | consistently check for null return and log warning rather than throw exception. This was being done already in some places. If an exception is thrown it is now an error rather than debug
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-126-20/+41
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-06-112-14/+30
| | | |\
| | | | * BulletSim: when meshing or asset fetching fails, include positionRobert Adams2013-06-112-14/+30
| | | | | | | | | | | | | | | | | | | | and region with the offending object's name in the error message.
| | | * | Revert "Add option to set minimum fee for classified ads"BlueWall2013-06-113-16/+1
| | | |/ | | | | | | | | | | | | This reverts commit 90097de6c3cf58989698b37c89baa8268895fc86.
| | | * Merge working repoBlueWall2013-06-113-1/+16
| | | |\
| | | | * Add option to set minimum fee for classified adsBlueWall2013-06-113-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting the minimum price for publishing a classified ad. http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
| | | * | Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-114-6/+11
| | | |/ | | | | | | | | | | | | | | | | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString().
| | * | Implement logging of first 80 characters (debug level 5) or full body data ↵Justin Clark-Casey (justincc)2013-06-122-5/+57
| | |/ | | | | | | | | | | | | | | | | | | (debug level 6) on outgoing requests, depending on debug level This is set via "debug http out <level>" This matches the existing debug level behaviours for logging incoming http data
| | * Uncomment Mic's code and split to create new regression ↵Justin Clark-Casey (justincc)2013-06-111-23/+41
| | | | | | | | | | | | TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
| * | 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
| |\
| * | Really bad idea to lock m_UserCache for so long in UserManagementModule. ↵Diva Canto2013-06-111-13/+17
| | | | | | | | | | | | Added a special lock object instead, if we really want to avoid concurrent executions of that code.
* | | Merge branch 'master' into careminsterMelanie2013-06-110-0/+0
|\ \ \ | | |/ | |/|
| * | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| | | | | | | | | | | | right corner.
* | | 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
| | | | |
generated by cgit v1.1 at 2024-12-14 19:12:42 +0000