aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1844-3226/+3419
|\
| * Flesh out the new permission methodMelanie2010-03-181-4/+95
| * Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| * Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminati...Dan Lake2010-03-1710-233/+258
| * minor logging changes to BaseHttpServer, OSHttpRequestJustin Clark-Casey (justincc)2010-03-162-30/+58
| * Removed the unused use_async_when_possible config variableJohn Hurliman2010-03-163-19/+2
| * Fixed several unhandled exceptions and performance issues with PrimitiveBaseS...John Hurliman2010-03-165-54/+66
| * * Fixing the SimianGrid friend connector enabled detection since the friends ...John Hurliman2010-03-161-1/+9
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-156-2/+32
| |\
| | * Get the local inner simulation service object to the handler so that there is...Diva Canto2010-03-155-0/+17
| | * Restoring LoadPlugin as it was before. Justin's last change made it throw.Diva Canto2010-03-153-2848/+2861
| * | Fixing line endingsJohn Hurliman2010-03-152-2846/+2846
| * | * Fixed a bug in Simian.IsSimianEnabled (since the default module strings fol...John Hurliman2010-03-151-1/+1
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-1510-2927/+2966
| |\
| * | Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectorsJohn Hurliman2010-03-1510-12/+12
| * | * UuidGatherer now tracks asset types for assets it discovers. The asset type...John Hurliman2010-03-157-33/+47
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-03-182-193/+199
|\ \ \
| * \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2010-03-182-193/+199
| |\ \ \
| | * | | Prevent llTeleportAgentHome from affecting godsThomas Grimshaw2010-03-171-0/+3
| | * | | Debugger tags for VS2010Thomas Grimshaw2010-03-162-193/+196
| * | | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| |/ / /
* | | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
* | | | Change GodLevel to UserLevel so gods can teleport freely without havingMelanie2010-03-151-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1577-3209/+7488
|\ \ \ \ | | |_|/ | |/| |
| * | | flip UVs for profile facesdahlia2010-03-131-1/+1
| * | | add a null check in ScenePresence constructordahlia2010-03-131-1/+2
| * | | correct some references which could produce erroneous prim face numbersdahlia2010-03-121-2202/+2201
| * | | some improvements to sculptmap alpha handling and LODdahlia2010-03-121-627/+645
| * | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-03-122-6/+5
| * | | refactor: Move another RezSingleAttachment() from Scene.Inventory to Attachme...Justin Clark-Casey (justincc)2010-03-125-37/+57
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-1215-163/+363
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-125-44/+56
| | |\ \
| | * | | Minor tweak to clean up SimianGrid asset service URLsJohn Hurliman2010-03-121-1/+1
| | * | | * Added a better check to the SimianGrid connectors to test if they are enabl...John Hurliman2010-03-1215-163/+363
| * | | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to Attachme...Justin Clark-Casey (justincc)2010-03-125-58/+60
| | |/ / | |/| |
| * | | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModuleJustin Clark-Casey (justincc)2010-03-124-44/+53
| * | | start laoding griduser local connector, though it isn't invoked by anything yetJustin Clark-Casey (justincc)2010-03-121-0/+3
| |/ /
| * | Fixing the previous patch to work correctly with standalone modeJohn Hurliman2010-03-129-36/+36
| * | Fixed SimianGrid connectors to gracefully exit if the required config section...John Hurliman2010-03-129-56/+63
| * | Simplify database setup and remove migration problems by moving all sqlite co...Justin Clark-Casey (justincc)2010-03-1211-9/+13
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-1211-0/+3667
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-123-15/+19
| | |\ \
| | | * | Bug fix: "last location" login.Diva Canto2010-03-121-0/+4
| | * | | Adding the SimianGrid connectorsJohn Hurliman2010-03-1110-0/+3663
| * | | | Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12Justin Clark-Casey (justincc)2010-03-127-54/+120
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-1257-150/+773
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Changed some properties and methods from private to protected in LLLoginRespo...Mikko Pallari2010-03-112-15/+15
| | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-1056-126/+749
| | |\ \
| | | * | Reintroduce a check that was dropped from permissionsMelanie2010-03-101-1/+1
| | | * | Formatting cleanup. Add copyright notices.Jeff Ames2010-03-1040-79/+349