| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-13 | 2 | -0/+73 |
|\ \
| |/ |
|
| * | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2012-01-12 | 2 | -2/+10 |
| |\ |
|
| * | | Move some interfaces to a more apropriate place | BlueWall | 2012-01-12 | 2 | -0/+73 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 2 | -2/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | Add permissions checks for owned avatars to all other osNpc* functions. | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -1/+1 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Renamed one var and deleted commented code. No functional changes. | Diva Canto | 2012-01-12 | 1 | -1/+1 |
| | |/ |
|
| * | | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth... | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -0/+8 |
| |/ |
|
| * | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ... | Melanie | 2012-01-06 | 1 | -3/+10 |
* | | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ... | Melanie | 2012-01-06 | 1 | -3/+10 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 2 | -2/+22 |
|\ \
| |/ |
|
| * | Improve "j2k decode" command to tell us how many layers and components were d... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -0/+10 |
| * | Add a "j2k decode" region console command that allows a manual request for a ... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+8 |
| * | Improve "app rebake" command to return a better message if no uploaded textur... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+4 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 2 | -0/+25 |
|\ \
| |/ |
|
| * | Separate out rebake request code from cache validation code AvatarFactoryModule. | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -0/+22 |
| * | Profile Updates | BlueWall | 2012-01-03 | 1 | -0/+3 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region... | Diva Canto | 2011-12-29 | 1 | -0/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -1/+10 |
|\ \
| |/ |
|
| * | Migrate detailed "appearance show" report generation up to AvatarFactoryModul... | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+10 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -21/+1 |
|\ \
| |/ |
|
| * | On a new client circuit, send the initial reply ack to let the client know it... | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -21/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -0/+11 |
|\ \
| |/ |
|
| * | Add test for removing a friendship. | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -0/+11 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 2 | -55/+2 |
|\ \
| |/ |
|
| * | Merge branch 'remove-scene-viewer' | Dan Lake | 2011-11-14 | 1 | -50/+0 |
| |\ |
|
| | * | Remove SceneViewer from ScenePresence to reduce quadruple queueing of | Dan Lake | 2011-11-11 | 1 | -50/+0 |
| * | | Improved method doc for AddFriend() - it actually does set up a two-way relat... | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -5/+2 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -0/+14 |
|\ \ \
| |/ / |
|
| * | | Add test for adding a friend whilst online | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -0/+14 |
| |/ |
|
* | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e... | Dan Lake | 2011-10-19 | 1 | -2/+2 |
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 1 | -5/+9 |
| |\ |
|
* | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+6 |
|\ \ \
| |/ / |
|
| * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 1 | -3/+6 |
* | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+9 |
|\ \ \
| | |/
| |/| |
|
| * | | Extend scripts stop/start/suspend/resume console commands to allow action on ... | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -5/+9 |
| |/ |
|
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+8 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+9 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+9 |
* | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 1 | -27/+10 |
|\ \
| |/ |
|
| * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... | Dan Lake | 2011-10-04 | 1 | -22/+9 |
* | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -29/+6 |
|\ \
| |/ |
|
| * | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 1 | -29/+6 |
* | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -2/+2 |
* | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+9 |
|\ \
| |/ |
|
| * | minor: remove clutter null check from pass in config to AvatarFactoryModule.I... | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -0/+9 |