aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* remove more merge artefactsUbitUmarov2012-04-041-10/+3
* reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This funct...UbitUmarov2012-04-042-3/+3
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-0417-123/+260
|\
| * 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://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-0140-336/+1596
|\ \ \ | |/ /
| * | 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-3132-428/+943
| |\ \ \ | | |/ / | |/| / | | |/
| | * 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-311-0/+5
| | * 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
| | * 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-303-8/+86
| | * 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-3011-85/+176
| | * 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
| | * Committing the Avination calling card moduleMelanie2012-03-291-0/+286
| | * Adding the Avination calling card interfaceMelanie2012-03-291-0/+13
| | * 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-2913-81/+467
| |\ \ | | |/
| | * 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-289-55/+31
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-283-23/+430
| | |\