Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | 12 | -241/+1230 | |
| |\ \ | ||||||
| | * | | 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 | 4 | -6/+11 | |
| | |\ \ \ | ||||||
| | | * | | | 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 | |
| | | | | | ||||||
| * | | | | 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 | 8 | -236/+219 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-06-07 | 4 | -6/+7 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| * | | | 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 | |
| | |/ / | |/| | | ||||||
| * | | | Database persistence for keyframes. Contains a Migration. | Melanie | 2013-06-06 | 2 | -4/+32 | |
| | | | | ||||||
| * | | | Hook up Keyframe motion to almost everything. Failing to cross a sim border | Melanie | 2013-06-06 | 11 | -0/+229 | |
| |/ / | | | | | | | | | | may yield unexpected results in some cases. No database persistence yet, | |||||
| * | | Committing Avination's Keyframe module. This is not hooked up yet and will ↵ | Melanie | 2013-06-06 | 1 | -0/+766 | |
| | | | | | | | | | | | | do nothing. More commits to follow. | |||||
| * | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2013-06-05 | 3 | -63/+342 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-05 | 4 | -37/+84 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-05 | 1 | -14/+16 | |
| | | |\ \ | ||||||
| | | * | | | Avoid a deadlock where a script can attempt to take a ↵ | Justin Clark-Casey (justincc) | 2013-06-05 | 1 | -11/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order. This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless). The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region. This looks to address http://opensimulator.org/mantis/view.php?id=6557 | |||||
| | * | | | | Port Avination's inventory send throttling | Melanie | 2013-06-05 | 2 | -52/+321 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 27 | -52/+549 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | 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 | |
| | | | | | |