aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2342-269/+883
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | reverted priorityQueue changesUbitUmarov2012-03-211-8/+3
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Simplify group access checks and break them out into a separate method.Melanie2012-04-051-57/+49
* | | | | | | | | | | | | Remove some unneeded parensMelanie2012-04-041-1/+1
* | | | | | | | | | | | | Adjust Snoopy's contribution for AVNMelanie2012-04-051-56/+14
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-041-1/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Implements group based access restrictions for parcels of land. Because of ca...Snoopy Pfeffer2012-04-051-1/+57
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Fix the last merge artefactsMelanie2012-04-032-5/+5
* | | | | | | | | | | More artefactMelanie2012-04-031-1/+1
* | | | | | | | | | | Fix more merge artefactsMelanie2012-04-031-3/+3
* | | | | | | | | | | Remove duplicate implementation of Material { get; set; }Melanie2012-04-031-14/+0
* | | | | | | | | | | Fix merge artefactsMelanie2012-04-032-27/+2
* | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-0318-117/+293
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawagui...Garmin Kawaguichi2012-04-0311-3/+74
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix more SOP.PhysActor race conditions in LSL_ApiJustin Clark-Casey (justincc)2012-04-031-7/+19
| * | | | | | | | Eliminate race condition where many callers would check SOP.PhysicsActor != n...Justin Clark-Casey (justincc)2012-04-036-155/+209
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-310-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Implement bulk inventory update over CAPS (not recursive by design,Melanie2012-03-311-1/+47
* | | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-314-17/+90
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement bulk inventory update over CAPS (not recursive by design,Melanie2012-03-311-1/+47
| * | | | | | | | | Cache the last maptile and return the cachrd tile if the last request isMelanie2012-03-291-8/+22
| * | | | | | | | | Allow the map tile module to be enabled without also eabling refreshMelanie2012-03-291-8/+11
| * | | | | | | | | Allow llTeleportAgent to work in attachmentsMelanie2012-03-291-0/+10
* | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-3134-428/+947
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-317-31/+31
| * | | | | | | | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con...Justin Clark-Casey (justincc)2012-03-314-39/+28
| * | | | | | | | Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secon...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * | | | | | | | Add MSSQL login processing fix for servers run on different locales.Justin Clark-Casey (justincc)2012-03-312-0/+6
| * | | | | | | | minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-312-2/+2
| * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-311-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Added missing dependency for MS 2008. I hope. (I don't have 2008 to test this...Diva Canto2012-03-301-0/+1
| * | | | | | | | | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-312-1/+12
| |/ / / / / / / /
| * | | | | | | | Add Extended flavour option to opensim version information.Justin Clark-Casey (justincc)2012-03-301-1/+2
| * | | | | | | | minor: remove some now unneeded code from FriendsCommandsModuleJustin Clark-Casey (justincc)2012-03-301-55/+0
| * | | | | | | | Make default "show friends" console command show friends fetched from the fri...Justin Clark-Casey (justincc)2012-03-304-8/+87
| * | | | | | | | Lock NullFriendsData.m_Data for consistency and against concurrent read/writeJustin Clark-Casey (justincc)2012-03-301-30/+39
| * | | | | | | | refactor: Move "friends show cache" console command out into separate Friends...Justin Clark-Casey (justincc)2012-03-304-97/+205
| * | | | | | | | Add simple login test with online friends. Add IFriendsModule.GrantRights() ...Justin Clark-Casey (justincc)2012-03-3012-85/+177
| * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-301-120/+218
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Finish up the SuitcaseInventory service.Diva Canto2012-03-291-120/+218
| * | | | | | | | | refactor: Stop passing both IClientAPI and agentID to friend event listeners,...Justin Clark-Casey (justincc)2012-03-296-31/+62
| |/ / / / / / / /
| * | | | | | | | Add simple regression test for logging in with offline friends. Don't expect...Justin Clark-Casey (justincc)2012-03-291-1/+46
| * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-291-1/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Also add OSS header to interfaceMelanie2012-03-291-1/+28
| * | | | | | | | | Add back parts of reverted changes that were not concerned with child agent c...Justin Clark-Casey (justincc)2012-03-298-8/+16
| |/ / / / / / / /
| * | | | | | | | Change namespace on CallingCardModule and correct interface file placemant. A...Melanie2012-03-292-2/+29
| * | | | | | | | Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-299-31/+55
| * | | | | | | | Revert "Add comment about setting client.SceneAgent in AddNewClient()"Justin Clark-Casey (justincc)2012-03-291-3/+0