Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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. | |||||
| * | | 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 | |
| | | | | | ||||||
| * | | | | Groups V2 -- fix mantis #6666 | Diva Canto | 2013-06-08 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-08 | 2 | -1/+30 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-07 | 2 | -1/+30 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | 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 | |||||
| | * | | | Put the configuration back in FetchInventoryDesc2 cap. | Diva Canto | 2013-06-07 | 1 | -0/+29 | |
| | | | | | ||||||
* | | | | | Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminster | Melanie | 2013-06-08 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | 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 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-06-07 | 5 | -8/+10 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| * | | | 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 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Mantis #6620 (removed debug message) | Diva Canto | 2013-06-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | In LocalFriendshipTerminated, send the original client's agentId to the ↵ | Donnie Roberts | 2013-06-07 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | friend being removed instead of the friend's own id. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-06-06 | 2 | -3/+31 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-06 | 1 | -0/+5 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-05 | 13 | -4/+261 | |
| | |\ \ | ||||||
| | * | | | Strengthen some assumptions. | Diva Canto | 2013-06-05 | 1 | -0/+5 | |
| | | | | | ||||||
| * | | | | Fix keyframe motion copyright | Melanie | 2013-06-06 | 1 | -3/+26 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 29 | -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 server | Melanie | 2013-06-04 | 1 | -0/+0 | |
| | | | | ||||||
| * | | | Fix llTeleportAgentGlobalCoords | Melanie | 2013-06-02 | 1 | -11/+16 | |
| | | | | ||||||
| * | | | Unsit seated avatars when an object is deleted | Melanie | 2013-06-02 | 1 | -0/+8 | |
| | | | | ||||||
| * | | | Implement PERMISSION_TELEPORT and the needed checks to make it work. | Melanie | 2013-06-02 | 2 | -7/+19 | |
| | | | | | | | | | | | | | | | | Old auth system still works as well. | |||||
| * | | | Fix multi-wear of alpha and tattoo layers. | Melanie | 2013-05-31 | 3 | -6/+6 | |
| | | | | ||||||
| * | | | Stop sending velocity to avoid snap-back | Melanie | 2013-05-31 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Allow Linden trees to preserve their type when taken into inventory and ↵ | Melanie | 2013-05-26 | 3 | -4/+20 | |
| | | | | | | | | | | | | | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects. | |||||
| * | | | Update the money framework to allow sending the new style linden "serverside ↵ | Melanie | 2013-05-25 | 9 | -44/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored! | |||||
| * | | | Reset "Show in search" on parcels cut off other parcels that are in search | Melanie | 2013-05-24 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Port fix from justicc - decouple pay prices on drag-copied prims | Melanie | 2013-05-24 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Let the event queue do lees work - expire every 40s as per Teravus instead ↵ | Melanie | 2013-05-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | of every seconds - whoever put that in.... | |||||
| * | | | * This fixes the avatar stuck in objects on login and teleport by gently ↵ | teravus | 2013-05-14 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | applying an upward motion when stuck in things on the Z * Comments describe how it filters out good, normal collisions, from 'stuck' collisions.. It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances. | |||||
| * | | | * Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. ↵ | teravus | 2013-05-14 | 1 | -1/+27 | |
| | | | | | | | | | | | | | | | | This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection) | |||||
| * | | | Explicitly zero avatar velocity on sit | Melanie | 2013-05-13 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Small adjustments to the floater module | Melanie | 2013-05-13 | 2 | -2/+5 | |
| | | | | ||||||
| * | | | Guard against trying to access terrain heights out of bounds. Clamp to sim. | Melanie | 2013-05-11 | 1 | -1/+9 | |
| | | | |