aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-138-109/+178
|\
| * Mantis 55025 Implement script time.Talun2012-04-127-46/+135
| * make changes to FlotsamCache.ini.example as noted in mantis #5960nebadon2012-04-121-2/+2
* | Merge branch 'master' into careminsterMelanie2012-04-1113-25/+171
|\ \ | |/
| * HGFriendsModule: Type casts to fix compile errorSnoopy Pfeffer2012-04-111-1/+1
| * HGFriendsModule: Added optional user level based restriction to send friendsh...Snoopy Pfeffer2012-04-113-4/+28
| * HGFriendsModule: add the scaffolding for supporting permissions pertaining to...Diva Canto2012-04-112-2/+32
| * New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as orig...Snoopy Pfeffer2012-04-105-2/+84
| * Add uri to various log messages when region registration fails. Upgrade some...Justin Clark-Casey (justincc)2012-04-101-8/+15
| * minor: convert tabs to spaces in config example files from recent 7c534e5Justin Clark-Casey (justincc)2012-04-102-12/+12
| * Correct max_listeners_per_region in OpenSimDefaults.ini to max_listens_per_re...Justin Clark-Casey (justincc)2012-04-101-1/+1
| * Do not timeout group member cache entry, as long as there are frequent group ...Snoopy Pfeffer2012-04-101-0/+3
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-091-10/+2
|\ \
| * | Fix a LSL merge artefactMelanie2012-04-081-10/+2
* | | Merge branch 'master' into careminsterMelanie2012-04-097-21/+159
|\ \ \ | | |/ | |/|
| * | Mantis5502 implementation of some of the new constantsTalun2012-04-096-20/+155
| * | Addresses mantis #5846Diva Canto2012-04-081-1/+3
* | | Merge branch 'master' into careminsterMelanie2012-04-083-50/+72
|\ \ \ | |/ / | | / | |/ |/|
| * A few more minor improvements on Suitcase inventory service.Diva Canto2012-04-071-7/+6
| * Added gatekeeper and uas addresses to grid info, so that viewers can take adv...Diva Canto2012-04-072-0/+16
| * Better Suitcase Inventory Service.Diva Canto2012-04-061-48/+55
* | Merge branch 'master' into careminsterMelanie2012-04-0727-373/+960
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-0610-128/+268
| |\
| | * Rather than having a FromFolderID property on every single prim and only ever...Justin Clark-Casey (justincc)2012-04-074-10/+19
| | * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-078-34/+29
| | * refactor: Eliminate unnecessary SOP.m_physActorJustin Clark-Casey (justincc)2012-04-061-10/+1
| | * Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ...Justin Clark-Casey (justincc)2012-04-061-0/+1
| | * refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()Justin Clark-Casey (justincc)2012-04-061-4/+4
| | * Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene o...Justin Clark-Casey (justincc)2012-04-062-13/+24
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-062-0/+82
| | |\
| | | * Addition of missing constants for llGetObjectDetails including for Mantis 5502Talun2012-04-062-0/+82
| | * | For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-062-3/+40
| | |/
| | * Make llGetMass() return total mass of object when called on root prim.Justin Clark-Casey (justincc)2012-04-061-1/+4
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-0626-205/+684
| | |\
| | * | remove possible PhysActor unexpectedly null race conditions when changing pri...Justin Clark-Casey (justincc)2012-04-032-63/+74
| * | | Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-064-150/+208
| | |/ | |/|
| * | Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-062-835/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-062-3/+49
| |\ \
| | * | Added missing refresh of group membership client side cache to the groups mod...Snoopy Pfeffer2012-04-051-1/+2
| | * | Revert last commitSnoopy Pfeffer2012-04-051-22/+25
| | * | Group based access restrictions to parcels require group membership, but not ...Snoopy Pfeffer2012-04-051-25/+22
| | * | Little bug fix in HasGroupAccess, to properly store the case "true" in the ca...Snoopy Pfeffer2012-04-051-5/+2
| * | | If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| * | | WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose...Diva Canto2012-04-062-57/+1007
| * | | A few minor tweaks here and there in XInventoryService.Diva Canto2012-04-061-14/+48
| * | | Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-066-33/+201
| * | | Packing of folder in SendBulkUpdateInventory always set the folder type to -1...Diva Canto2012-04-061-1/+2
| * | | Guard against null inventory contents.Diva Canto2012-04-061-2/+2
| * | | Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
* | | | Merge branch 'ubitwork'Melanie2012-04-046-145/+462
|\ \ \ \