aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-131-3/+0
|\
| * Undo some prior workBlueWall2012-01-121-3/+0
* | Merge branch 'master' into careminsterMelanie2012-01-132-0/+73
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-01-122-2/+10
| |\
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-0/+73
* | | Merge branch 'master' into careminsterMelanie2012-01-122-2/+10
|\ \ \ | | |/ | |/|
| * | Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-1/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-123-7/+7
| |\ \
| | * | Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-121-1/+1
| | |/
| * | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth...Justin Clark-Casey (justincc)2012-01-121-0/+8
* | | Merge branch 'master' into careminsterMelanie2012-01-122-7/+7
|\ \ \ | | |/ | |/|
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-122-6/+6
| |/
| * If deserializing a scene object fails during IAR load then ignore the object ...Justin Clark-Casey (justincc)2012-01-111-1/+1
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-101-2/+0
| |\
| * | 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-102-19/+32
|\ \ \ | | |/ | |/|
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| |/
| * Add some run-time debugging supportBlueWall2012-01-092-1/+6
| * 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
* | Merge branch 'master' into careminsterMelanie2012-01-091-2/+4
|\ \ | |/
| * Fix HG teleport routingBlueWall2012-01-091-2/+4
| * Fix a build breakMelanie2012-01-091-1/+1
| * Add the HG case to landing point checksMelanie2012-01-091-1/+1
| * Update teleport routing to match AvinationMelanie2012-01-081-16/+58
| * Fix teleport routingBlueWall2012-01-081-0/+17
* | Update teleport routing to match AvinationMelanie2012-01-081-1/+2
* | Merge branch 'master' into careminsterMelanie2012-01-072-20/+22
|\ \ | |/
| * Add method doc to SPA.Falling and use automatic private get propertyJustin Clark-Casey (justincc)2012-01-071-13/+14
| * Fix bug where tapping home to stop falling would stop any avatar movement oth...Justin Clark-Casey (justincc)2012-01-072-9/+10
| * Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ...Melanie2012-01-061-3/+10
| * If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-16/+39
* | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ...Melanie2012-01-061-3/+10
* | If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-5/+24
* | Merge branch 'master' into careminsterMelanie2012-01-062-2/+22
|\ \ | |/
| * Improve "j2k decode" command to tell us how many layers and components were d...Justin Clark-Casey (justincc)2012-01-051-0/+10
| * Add a "j2k decode" region console command that allows a manual request for a ...Justin Clark-Casey (justincc)2012-01-051-1/+8
| * Improve "app rebake" command to return a better message if no uploaded textur...Justin Clark-Casey (justincc)2012-01-051-1/+4
* | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-056-5/+55
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-057-12/+58
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-055-5/+52
| | |\
| | | * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-041-0/+22
| | | * Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-036-177/+214
| | | |\