aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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-283-23/+429
| * | Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoic...Justin Clark-Casey (justincc)2012-03-281-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-272-0/+50
| |\
| | * 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-287-16/+225
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-285-16/+175
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-273-2/+120
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-282-1/+116
| | | |\
| | | * | Add "friends show cache <first-name> <last-name>" command for debugging purpo...Justin Clark-Casey (justincc)2012-03-283-2/+120
| | * | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-272-14/+55
| | | |/ | | |/|
| * | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-282-0/+50
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-03-284-48/+73
|\ \ \ | |/ /
| * | Add a corresponding method for items. HG v2Melanie2012-03-282-0/+39