aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-132-96/+0
|\
| * Undo some prior workBlueWall2012-01-122-96/+0
* | Merge branch 'master' into careminsterMelanie2012-01-136-13/+3
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-01-1211-137/+360
| |\
| | * Change the default osNpcCreate() to create an 'owned' npc rather than an 'uno...Justin Clark-Casey (justincc)2012-01-131-1/+1
| | * Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string name...Justin Clark-Casey (justincc)2012-01-133-12/+0
| | * Add missing assert to confirm owner delete succeeded to the end of TestOsNpcR...Justin Clark-Casey (justincc)2012-01-121-0/+2
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-0/+0
* | | Fix typoMelanie2012-01-121-1/+1
* | | Disable unowned NPCsMelanie2012-01-121-0/+3
* | | Merge branch 'master' into careminsterMelanie2012-01-1211-82/+311
|\ \ \ | | |/ | |/|
| * | Add api level test for removing an owned npcJustin Clark-Casey (justincc)2012-01-121-2/+55
| * | Add ossl level test for removing an unowned npcJustin Clark-Casey (justincc)2012-01-121-0/+115
| * | Add remove test for unowned avatarsJustin Clark-Casey (justincc)2012-01-121-0/+20
| * | Add osNpcCreate(string firstname, string lastname, LSL_Vector position, strin...Justin Clark-Casey (justincc)2012-01-124-0/+15
| * | Allow all NPCs to show up on sensors as all osNpc* script methods now check f...Justin Clark-Casey (justincc)2012-01-121-6/+9
| * | Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-123-25/+52
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-1214-118/+104
| |\ \
| | * | Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-122-34/+3
| * | | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth...Justin Clark-Casey (justincc)2012-01-123-18/+45
* | | | Merge branch 'master' into careminsterMelanie2012-01-1216-88/+114
|\ \ \ \ | | |/ / | |/| |
| * | | Allow update of stored entries within User Management Module-this is needed f...Bo Iwu2012-01-121-48/+52
| | |/ | |/|
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-1211-33/+46
| * | Correcting ini.example were permissionmodules uses komma instead of space as ...Michelle Argus2012-01-121-3/+3
| |/
| * If deserializing a scene object fails during IAR load then ignore the object ...Justin Clark-Casey (justincc)2012-01-112-2/+5
| * Add a check to see if an asset exists before recreating it whileMic Bowman2012-01-101-0/+6
| * minor: Fix wrong column length in image queues reportJustin Clark-Casey (justincc)2012-01-101-2/+2
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
* | Adapt a cast to using the new TeleportFlagsMelanie2012-01-111-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-103-24/+104
|\ \ | |/
| * rename "show image queue" to "show image queues" in line with other udp info ...Justin Clark-Casey (justincc)2012-01-101-29/+8
| * Add "show image queue <first-name> <last-name>" region console commandJustin Clark-Casey (justincc)2012-01-103-6/+107
* | Merge branch 'master' into careminsterMelanie2012-01-104-14/+10
|\ \ | |/
| * Remove DEBUG optionBlueWall2012-01-101-5/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-104-6/+71
| |\
| | * Add avatar names to appearance log messagesJustin Clark-Casey (justincc)2012-01-101-3/+3
| | * correct very minor typo in "debug scene" helpJustin Clark-Casey (justincc)2012-01-101-1/+1
| * | HG landing points: this hopefully fixes some confusion that was making HG avi...Diva Canto2012-01-101-5/+6
* | | Merge branch 'master' into careminsterMelanie2012-01-106-21/+107
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-102-2/+52
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-101-2/+2
| | |\ \ | | | |/
| | | * HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ...Diva Canto2012-01-101-2/+2
| | * | Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a...Justin Clark-Casey (justincc)2012-01-101-0/+50
| | |/
| * | Teleport DebuggingBlueWall2012-01-102-2/+17
| |/
| * Add some run-time debugging supportBlueWall2012-01-093-1/+12
| * Use our TeleportFlagsBlueWall2012-01-092-22/+30
| * TP Routing debugBlueWall2012-01-091-2/+5
* | Merge branch 'master' into careminsterMelanie2012-01-091-1/+20
|\ \ | |/
| * Fix teleport routing for incoming HG+OwnerBlueWall2012-01-091-18/+19
| * Debugging HG teleport routingBlueWall2012-01-091-0/+18