aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-0317-116/+292
|\
| * 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-035-154/+208
| * 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-3120-245/+606
|\ \ \ | |/ / |/| / | |/
| * 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-313-35/+24
| * Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secon...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-312-2/+2
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-312-1/+12
| * 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-303-8/+86
| * 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-305-64/+102
| * refactor: Stop passing both IClientAPI and agentID to friend event listeners,...Justin Clark-Casey (justincc)2012-03-294-27/+58
| * 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-296-6/+14
| |/
| * Change namespace on CallingCardModule and correct interface file placemant. A...Melanie2012-03-292-2/+42
| * Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-297-29/+53
| * Revert "Add comment about setting client.SceneAgent in AddNewClient()"Justin Clark-Casey (justincc)2012-03-291-3/+0
| * Committing the Avination calling card moduleMelanie2012-03-291-0/+286
| * Pushing the Avination Calling card hooks. Module to follow.Melanie2012-03-291-4/+17
* | Committing the Avination calling card moduleMelanie2012-03-281-0/+286
* | Merge branch 'master' into careminsterMelanie2012-03-299-78/+96
|\ \ | |/
| * Add comment about setting client.SceneAgent in AddNewClient()Justin Clark-Casey (justincc)2012-03-291-0/+3
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-287-53/+29
| * HG 2.0 Suitcase inventory: proof of concept now working properly with the hea...Diva Canto2012-03-281-10/+11
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-282-23/+61
* | Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+48
| |\
| | * Typo fixMelanie2012-03-281-1/+1
| * | More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-272-15/+18
* | | Typo fixMelanie2012-03-281-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-03-281-2/+2
|\ \ \ | | |/ | |/|
| * | Fix typosMelanie2012-03-281-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-03-286-16/+223
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-285-16/+175
| |\ \ | | |/