aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-06-234-7/+14
|\
| * Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| * Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
| * Forward the reason to the scriptMelanie2013-06-131-1/+1
| * Add a result param to te money module interfaceMelanie2013-06-133-4/+7
| * * This fixes having to select and deselect prim to get keyframemotion to star...Melanie2013-06-133-2/+8
* | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \
| * | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-06-189-61/+191
|\ \ \ | |/ /
| * | correct method doc for llRot2Axis()dahlia2013-06-141-1/+1
| * | Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfi...Justin Clark-Casey (justincc)2013-06-151-14/+13
| * | Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| * | refactor: In UserProfileModule, change classifiedCache and classifiedInterest...Justin Clark-Casey (justincc)2013-06-151-19/+23
| * | Add the standard OpenSimulator copyright notice to the top of InventoryCache.csJustin Clark-Casey (justincc)2013-06-151-1/+28
| * | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache i...Justin Clark-Casey (justincc)2013-06-151-14/+23
| * | minor: remove mono compiler warnings from LSL_Api, properly format method doc...Justin Clark-Casey (justincc)2013-06-151-7/+5
| * | Mantis 6280: llSetContentType(). An implementation.Talun2013-06-154-0/+84
| * | Mantis 6108: ossetprimitiveparams temporary/phantom problemTalun2013-06-151-2/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-144-10/+28
| |\ \
| | * \ Merge branch 'master' of /home/opensim/src/opensimBlueWall2013-06-132-2/+20
| | |\ \
| | | * | Add Option: ClassifiedFeeBlueWall2013-06-132-2/+20
| * | | | Don't try to abort worker threads in WebFetchInvDescModule if module was not ...Justin Clark-Casey (justincc)2013-06-141-6/+4
* | | | | 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 star...teravus2013-06-123-4/+8
| | * | | | Make XInventoryServicesConnector properly handle a RESULT = false return for ...Justin Clark-Casey (justincc)2013-06-131-68/+56
| | |/ / /
| | * | | After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistent...Justin Clark-Casey (justincc)2013-06-122-2/+24
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-126-20/+41
| | |\ \ \ | | | |/ /
| | | * | BulletSim: when meshing or asset fetching fails, include positionRobert Adams2013-06-112-14/+30
| | | * | Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-114-6/+11
| | * | | Implement logging of first 80 characters (debug level 5) or full body data (d...Justin Clark-Casey (justincc)2013-06-122-5/+57
| | |/ /
| | * | Uncomment Mic's code and split to create new regression TestAddTemporaryAsset...Justin Clark-Casey (justincc)2013-06-111-23/+41
| * | | 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
| |\ \
| | * | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| * | | Really bad idea to lock m_UserCache for so long in UserManagementModule. Adde...Diva Canto2013-06-111-13/+17
* | | | 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
| * | | 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
| * | | 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
| * | | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Add...dahlia2013-06-111-0/+3
| * | | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization f...dahlia2013-06-101-2/+2
| * | | 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 normalizi...dahlia2013-06-101-22/+6