Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2013-06-13 | 5 | -2/+29 |
|\ | |||||
| * | Add Option: ClassifiedFee | BlueWall | 2013-06-13 | 5 | -2/+29 |
| | | | | | | | | | | | | | | | | | | | | Add option to set minimum fee for publishing classifieds. Many viewers have a hard coded minimum of 50, which makes publishing classifieds fail where grids have no economy. This allows the grid to set the minimum fee to a suitable value for their operation. The option is located in the [LoginService] section and defaults to 0. The value is sent as "classified_fee" in the login response. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-12 | 15 | -122/+227 |
|\ \ | |||||
| * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-13 | 3 | -4/+8 |
| |\ \ | |||||
| | * | | * This fixes having to select and deselect prim to get keyframemotion to ↵ | teravus | 2013-06-12 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | start running when pulled from data storage. | ||||
| * | | | Make XInventoryServicesConnector properly handle a RESULT = false return for ↵ | Justin Clark-Casey (justincc) | 2013-06-13 | 1 | -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-12 | 2 | -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/opensim | Justin Clark-Casey (justincc) | 2013-06-12 | 6 | -20/+41 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2013-06-11 | 2 | -14/+30 |
| | |\ | |||||
| | | * | BulletSim: when meshing or asset fetching fails, include position | Robert Adams | 2013-06-11 | 2 | -14/+30 |
| | | | | | | | | | | | | | | | | and region with the offending object's name in the error message. | ||||
| | * | | Revert "Add option to set minimum fee for classified ads" | BlueWall | 2013-06-11 | 3 | -16/+1 |
| | |/ | | | | | | | | | | This reverts commit 90097de6c3cf58989698b37c89baa8268895fc86. | ||||
| | * | Merge working repo | BlueWall | 2013-06-11 | 3 | -1/+16 |
| | |\ | |||||
| | | * | Add option to set minimum fee for classified ads | BlueWall | 2013-06-11 | 3 | -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 added | Robert Adams | 2013-06-11 | 4 | -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-12 | 2 | -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-11 | 1 | -23/+41 |
| | | | | | | | | TestAddTemporaryAsset() and TestAddTemporaryLocalAsset() | ||||
* | | DataSnapshot: changed those annoying messages to Debug instead of Info. | Diva Canto | 2013-06-12 | 2 | -8/+8 |
|/ | |||||
* | Removed the lock entirely | Diva Canto | 2013-06-11 | 1 | -56/+52 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-11 | 13 | -74/+153 |
|\ | |||||
| * | Put the "script saved" and "notecard saved" messages back into the bottom | Melanie | 2013-06-11 | 1 | -2/+2 |
| | | | | | | | | right corner. | ||||
| * | * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵ | teravus | 2013-06-11 | 3 | -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. ↵ | dahlia | 2013-06-11 | 1 | -0/+3 |
| | | | | | | | | Addresses Mantis #0006671 | ||||
| * | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization ↵ | dahlia | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | fails | ||||
| * | llRot2Angle now checks absolute value of s rotation component before normalizing | dahlia | 2013-06-10 | 1 | -11/+3 |
| | | |||||
| * | llRot2Axis now checks absolute value of s rotation component before ↵ | dahlia | 2013-06-10 | 1 | -22/+6 |
| | | | | | | | | normalizing. Also removed some excessive division and cleaned up a bit | ||||
| * | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669 | teravus | 2013-06-10 | 1 | -2/+4 |
| | | |||||
| * | add a Normalize() method for LSL_Rotation | dahlia | 2013-06-10 | 1 | -0/+25 |
| | | |||||
| * | Add port numbers to poll service thread names so that we can tell which ↵ | Justin Clark-Casey (justincc) | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | belong to which HttpServer | ||||
| * | Reinstate explicit starting and stopping of PollServiceRequestManager added ↵ | Justin Clark-Casey (justincc) | 2013-06-10 | 2 | -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/opensim | Mic Bowman | 2013-06-10 | 4 | -34/+51 |
| |\ | |||||
| | * | BulletSim: add failure flag for meshing failure vs asset fetch failure | Robert Adams | 2013-06-10 | 4 | -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 assets | Mic Bowman | 2013-06-10 | 1 | -0/+20 |
| |/ | | | | | | | is there but commented out. | ||||
* | | Really bad idea to lock m_UserCache for so long in UserManagementModule. ↵ | Diva Canto | 2013-06-11 | 1 | -13/+17 |
|/ | | | | Added a special lock object instead, if we really want to avoid concurrent executions of that code. | ||||
* | Remove Temporary from use to shortcut asset stores. The Local property | Mic Bowman | 2013-06-10 | 4 | -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 computing | Talun | 2013-06-10 | 1 | -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 Canto | 2013-06-09 | 1 | -7/+4 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-08 | 13 | -241/+1231 |
|\ | |||||
| * | Catch exception triggered by incoming avatars using legacy profiles | BlueWall | 2013-06-08 | 1 | -1/+10 |
| | | |||||
| * | Merge branch 'profiles' | BlueWall | 2013-06-07 | 4 | -0/+998 |
| |\ | | | | | | | | | | message to explain why this merge is necessary, | ||||
| | * | SQLite support for UserProfiles | BlueWall | 2013-06-07 | 3 | -0/+995 |
| | | | |||||
| | * | Ensure selected module is the only active one | BlueWall | 2013-06-07 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-07 | 2 | -1/+30 |
| |\ \ | |||||
| * | | | Supply proper type information for the various types of requests | Melanie | 2013-06-07 | 3 | -9/+8 |
| | | | | |||||
| * | | | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 9 | -236/+220 |
| | |/ | |/| | |||||
* | | | Groups V2 -- fix mantis #6666 | Diva Canto | 2013-06-08 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-07 | 5 | -8/+14 |
|\ \ | |||||
| * | | minor: Comment out debug logging (at warn level) about number of objects ↵ | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -1/+1 |
| |/ | | | | | | | force selected and turn down to debug level | ||||
| * | minor: add dr0berts to contributors list | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -2/+3 |
| | | |||||
| * | Fix regression where multiple close agents could be sent to the wrong ↵ | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2013-06-07 | 2 | -4/+27 |
| |\ |