| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'avination-current' into careminster | Melanie | 2013-06-23 | 4 | -7/+14 |
|\ |
|
| * | Fix prim locking to behave like SL | Melanie | 2013-06-23 | 1 | -2/+2 |
| * | Allow coalesced objects to be rezzed even if they extend past the sim bounds | Melanie | 2013-06-18 | 1 | -2/+6 |
| * | Forward the reason to the script | Melanie | 2013-06-13 | 1 | -1/+1 |
| * | Add a result param to te money module interface | Melanie | 2013-06-13 | 3 | -4/+7 |
| * | * This fixes having to select and deselect prim to get keyframemotion to star... | Melanie | 2013-06-13 | 3 | -2/+8 |
* | | Merge branch 'master' into careminster | Melanie | 2013-06-23 | 1 | -2/+2 |
|\ \ |
|
| * | | Fix prim locking to behave like SL | Melanie | 2013-06-23 | 1 | -2/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-06-18 | 9 | -61/+191 |
|\ \ \
| |/ / |
|
| * | | correct method doc for llRot2Axis() | dahlia | 2013-06-14 | 1 | -1/+1 |
| * | | Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfi... | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -14/+13 |
| * | | Correct build break in previous commit 9c530d7 | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -10/+7 |
| * | | refactor: In UserProfileModule, change classifiedCache and classifiedInterest... | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -19/+23 |
| * | | Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -1/+28 |
| * | | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache i... | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -14/+23 |
| * | | minor: remove mono compiler warnings from LSL_Api, properly format method doc... | Justin Clark-Casey (justincc) | 2013-06-15 | 1 | -7/+5 |
| * | | Mantis 6280: llSetContentType(). An implementation. | Talun | 2013-06-15 | 4 | -0/+84 |
| * | | Mantis 6108: ossetprimitiveparams temporary/phantom problem | Talun | 2013-06-15 | 1 | -2/+2 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-14 | 4 | -10/+28 |
| |\ \ |
|
| | * \ | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2013-06-13 | 2 | -2/+20 |
| | |\ \ |
|
| | | * | | Add Option: ClassifiedFee | BlueWall | 2013-06-13 | 2 | -2/+20 |
| * | | | | Don't try to abort worker threads in WebFetchInvDescModule if module was not ... | Justin Clark-Casey (justincc) | 2013-06-14 | 1 | -6/+4 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-13 | 18 | -181/+286 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | 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 star... | teravus | 2013-06-12 | 3 | -4/+8 |
| | * | | | | Make XInventoryServicesConnector properly handle a RESULT = false return for ... | Justin Clark-Casey (justincc) | 2013-06-13 | 1 | -68/+56 |
| | |/ / / |
|
| | * | | | After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistent... | Justin Clark-Casey (justincc) | 2013-06-12 | 2 | -2/+24 |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-12 | 6 | -20/+41 |
| | |\ \ \
| | | |/ / |
|
| | | * | | BulletSim: when meshing or asset fetching fails, include position | Robert Adams | 2013-06-11 | 2 | -14/+30 |
| | | * | | Add TriggerScenePresenceUpdated events when an animation is added | Robert Adams | 2013-06-11 | 4 | -6/+11 |
| | * | | | Implement logging of first 80 characters (debug level 5) or full body data (d... | Justin Clark-Casey (justincc) | 2013-06-12 | 2 | -5/+57 |
| | |/ / |
|
| | * | | Uncomment Mic's code and split to create new regression TestAddTemporaryAsset... | Justin Clark-Casey (justincc) | 2013-06-11 | 1 | -23/+41 |
| * | | | 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 |
| * | | | Really bad idea to lock m_UserCache for so long in UserManagementModule. Adde... | Diva Canto | 2013-06-11 | 1 | -13/+17 |
* | | | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-11 | 5 | -332/+16 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Put the "script saved" and "notecard saved" messages back into the bottom | Melanie | 2013-06-11 | 1 | -2/+2 |
| * | | | Explicitly set uploaded mesh object perms | Melanie | 2013-06-10 | 1 | -10/+13 |
| * | | | Make objects attached from the ground appear in inventory again. Fixes a number | Melanie | 2013-06-08 | 1 | -1/+1 |
| * | | | Clean up poll service | Melanie | 2013-06-07 | 2 | -319/+0 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-06-11 | 5 | -15/+43 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ... | teravus | 2013-06-11 | 3 | -2/+35 |
| * | | | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Add... | dahlia | 2013-06-11 | 1 | -0/+3 |
| * | | | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization f... | dahlia | 2013-06-10 | 1 | -2/+2 |
| * | | | llRot2Angle now checks absolute value of s rotation component before normalizing | dahlia | 2013-06-10 | 1 | -11/+3 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-06-11 | 1 | -22/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | llRot2Axis now checks absolute value of s rotation component before normalizi... | dahlia | 2013-06-10 | 1 | -22/+6 |