| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix the last merge artefacts | Melanie | 2012-04-03 | 2 | -5/+5 |
* | More artefact | Melanie | 2012-04-03 | 1 | -1/+1 |
* | Fix more merge artefacts | Melanie | 2012-04-03 | 1 | -3/+3 |
* | Remove duplicate implementation of Material { get; set; } | Melanie | 2012-04-03 | 1 | -14/+0 |
* | Fix merge artefacts | Melanie | 2012-04-03 | 2 | -27/+2 |
* | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 18 | -117/+293 |
|\ |
|
| * | terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawagui... | Garmin Kawaguichi | 2012-04-03 | 11 | -3/+74 |
| * | Fix more SOP.PhysActor race conditions in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-03 | 1 | -7/+19 |
| * | Eliminate race condition where many callers would check SOP.PhysicsActor != n... | Justin Clark-Casey (justincc) | 2012-04-03 | 6 | -155/+209 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-03-31 | 4 | -17/+90 |
|\ \ |
|
| * | | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 |
| * | | Cache the last maptile and return the cachrd tile if the last request is | Melanie | 2012-03-29 | 1 | -8/+22 |
| * | | Allow the map tile module to be enabled without also eabling refresh | Melanie | 2012-03-29 | 1 | -8/+11 |
| * | | Allow llTeleportAgent to work in attachments | Melanie | 2012-03-29 | 1 | -0/+10 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 34 | -428/+947 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... | Justin Clark-Casey (justincc) | 2012-03-31 | 7 | -31/+31 |
| * | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con... | Justin Clark-Casey (justincc) | 2012-03-31 | 4 | -39/+28 |
| * | Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secon... | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -1/+1 |
| * | Add MSSQL login processing fix for servers run on different locales. | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -0/+6 |
| * | minor: small message adjustment and unnecessary code elimination when notifyi... | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -2/+2 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -0/+1 |
| |\ |
|
| | * | Added missing dependency for MS 2008. I hope. (I don't have 2008 to test this... | Diva Canto | 2012-03-30 | 1 | -0/+1 |
| * | | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932 | PixelTomsen | 2012-03-31 | 2 | -1/+12 |
| |/ |
|
| * | Add Extended flavour option to opensim version information. | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -1/+2 |
| * | minor: remove some now unneeded code from FriendsCommandsModule | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -55/+0 |
| * | Make default "show friends" console command show friends fetched from the fri... | Justin Clark-Casey (justincc) | 2012-03-30 | 4 | -8/+87 |
| * | Lock NullFriendsData.m_Data for consistency and against concurrent read/write | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -30/+39 |
| * | refactor: Move "friends show cache" console command out into separate Friends... | Justin Clark-Casey (justincc) | 2012-03-30 | 4 | -97/+205 |
| * | Add simple login test with online friends. Add IFriendsModule.GrantRights() ... | Justin Clark-Casey (justincc) | 2012-03-30 | 12 | -85/+177 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -120/+218 |
| |\ |
|
| | * | Finish up the SuitcaseInventory service. | Diva Canto | 2012-03-29 | 1 | -120/+218 |
| * | | refactor: Stop passing both IClientAPI and agentID to friend event listeners,... | Justin Clark-Casey (justincc) | 2012-03-29 | 6 | -31/+62 |
| |/ |
|
| * | Add simple regression test for logging in with offline friends. Don't expect... | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -1/+46 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -1/+28 |
| |\ |
|
| | * | Also add OSS header to interface | Melanie | 2012-03-29 | 1 | -1/+28 |
| * | | Add back parts of reverted changes that were not concerned with child agent c... | Justin Clark-Casey (justincc) | 2012-03-29 | 8 | -8/+16 |
| |/ |
|
| * | Change namespace on CallingCardModule and correct interface file placemant. A... | Melanie | 2012-03-29 | 2 | -2/+29 |
| * | Revert "Simplify friends caching by only doing this for root agents - no func... | Justin Clark-Casey (justincc) | 2012-03-29 | 9 | -31/+55 |
| * | Revert "Add comment about setting client.SceneAgent in AddNewClient()" | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -3/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | Committing the Avination calling card module | Melanie | 2012-03-29 | 1 | -0/+286 |
| * | Adding the Avination calling card interface | Melanie | 2012-03-29 | 1 | -0/+13 |
| * | Pushing the Avination Calling card hooks. Module to follow. | Melanie | 2012-03-29 | 1 | -4/+17 |
* | | Committing the Avination calling card module | Melanie | 2012-03-28 | 1 | -0/+286 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 20 | -85/+471 |
|\ \
| |/ |
|
| * | Add comment about setting client.SceneAgent in AddNewClient() | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -0/+3 |
| * | Simplify friends caching by only doing this for root agents - no functions re... | Justin Clark-Casey (justincc) | 2012-03-28 | 9 | -55/+31 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 7 | -4/+4 |
| |\ |
|