aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...Melanie2012-08-143-46/+85
|\
| * Merge branch 'careminster' into avinationMelanie2012-08-143-46/+85
| |\
| | * Merge branch 'master' into careminsterMelanie2012-08-142-38/+49
| | |\
| | | * Prevent race conditions when one thread removes an NPC SP before another thre...Justin Clark-Casey (justincc)2012-08-142-39/+50
| | * | Merge branch 'master' into careminsterMelanie2012-08-141-8/+36
| | |\ \ | | | |/
| | | * Perform ownership transfer and permission propagation as well as neededMelanie2012-08-141-0/+28
| | | * Move inititalization to RegionLoaded to avoid a module loading order issueMelanie2012-08-141-8/+8
* | | | Removed more spammy NPC crapMelanie2012-08-141-1/+1
|/ / /
* | | Comment spammy debugMelanie2012-08-141-3/+3
* | | Merge branch 'careminster' into avinationMelanie2012-08-1429-431/+871
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-08-147-20/+168
| |\ \ | | |/
| | * Implement the temp attachments. UNTESTEDMelanie2012-08-141-0/+44
| | * As per lindn spec, disable detach and drop for temp attachmentsMelanie2012-08-141-0/+8
| | * Add the skeleton for the temp attachments moduleMelanie2012-08-141-0/+82
| | * Exclude temp attachemnts from being sent to the avatar serviceMelanie2012-08-141-1/+2
| | * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-145-20/+33
| * | Merge branch 'master' into careminsterMelanie2012-08-131-6/+68
| |\ \ | | |/
| | * attempt at replicating behaviour of llList2thing functions in SLSignpostMarv2012-08-131-7/+69
| * | Merge branch 'master' into careminsterMelanie2012-08-1113-286/+378
| |\ \ | | |/
| | * Merge branch 'bulletsim7'Robert Adams2012-08-109-286/+378
| | |\
| | | * BulletSim: many, many detailed logging messages for physical linksetRobert Adams2012-08-107-44/+78
| | | * BulletSim: Add module names to DetailLog output. Fix some problems with links...Robert Adams2012-08-103-63/+71
| | | * BulletSim: add an identifier to the TaintObject call so exceptions that happe...Robert Adams2012-08-094-52/+57
| | | * BulletSim: separate out the constraints by type. The linksets useRobert Adams2012-08-096-94/+146
| | | * BulletSim: add avatar code to keep avatars from ending up trapped under the t...Robert Adams2012-08-085-54/+47
| | * | BulletSim: actually update the DLLs and SOsRobert Adams2012-08-104-0/+0
| | |/
| * | Merge branch 'master' into careminsterMelanie2012-08-098-14/+47
| |\ \ | | |/
| | * BulletSim: Added avatar capsule scaling for size of avatar.Robert Adams2012-08-078-14/+47
| * | Merge branch 'master' into careminsterMelanie2012-08-071-0/+6
| |\ \ | | |/
| | * Release http-in URLs when llResetScript is calledMelanie2012-08-071-0/+6
| * | Merge branch 'master' into careminsterMelanie2012-08-076-4/+7
| |\ \ | | |/
| | * BulletSim: update SOs and DLLs to run on more Linux versions. Correct multipl...Robert Adams2012-08-066-4/+7
| * | Merge branch 'master' into careminsterMelanie2012-08-0418-113/+215
| |\ \ | | |/
| | * Strip experimental tag from --publish option of "save oar" region console com...Justin Clark-Casey (justincc)2012-08-031-8/+7
| | * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-033-36/+73
| | * Fix build break.Justin Clark-Casey (justincc)2012-08-031-1/+1
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-08-031-4/+4
| | |\
| | | * Update settings loading in AvatarFactoryModule which should have been in last...Justin Clark-Casey (justincc)2012-08-031-4/+4
| | * | BulletSim: update DLLs and SOsRobert Adams2012-08-034-0/+0
| | * | BulletSim: pass collision subscription information to the C++ code so collisi...Robert Adams2012-08-033-16/+45
| | * | BulletSim: Add AddObjectForce to BulletSim API.Robert Adams2012-08-033-20/+38
| | |/
| | * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAp...Justin Clark-Casey (justincc)2012-08-033-23/+23
| | * Restore SOG constructor chaining removed in recent 513b77b. This is not a fu...Justin Clark-Casey (justincc)2012-08-031-1/+1
| | * Fix the recent windows compile error by putting newFont for case "R" in Vecto...Justin Clark-Casey (justincc)2012-08-031-3/+8
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-031-2/+2
| | |\
| | | * attempting to fix a build issueSignpostMarv2012-08-031-2/+2
| | * | Move previously unadvertised SendPeriodicAppearanceUpdates setting from [Star...Justin Clark-Casey (justincc)2012-08-032-2/+15
| | |/
* | | Merge branch 'avination' into ubitworkUbitUmarov2012-08-071-0/+6
|\ \ \
| * \ \ Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster in...Melanie2012-08-071-0/+7
| |\ \ \
| * | | | Release http-in URLs when llResetScript is calledMelanie2012-08-071-0/+6