aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-21663-40549/+83928
|\
| * Merge branch 'master' into careminsterMelanie2014-01-2859-1643/+2129
| |\
| | * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-284-24/+75
| | |\
| | | * Added osGetRegionSize(), which returns the region size in meters and recogniz...Oren Hurvitz2014-01-283-0/+29
| | | * Convert tabs to spaces from previous commit 8c2b41b01Justin Clark-Casey (justincc)2014-01-281-27/+27
| | | * Make inidirectory files supercede distro filesDev Random2014-01-271-27/+49
| | * | Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| | * | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occu...Justin Clark-Casey (justincc)2014-01-271-2/+1
| | * | Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-241-21/+19
| | |\ \ | | | |/
| | | * minor: remove long unused state queue from "show queues" console reportsJustin Clark-Casey (justincc)2014-01-241-5/+3
| | | * minor: correct the usage statement on the "show image queues" console command...Justin Clark-Casey (justincc)2014-01-241-1/+1
| | | * Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) fro...Justin Clark-Casey (justincc)2014-01-241-15/+15
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-244-320/+362
| | |\ \ | | | |/
| | | * Properly dispose of drawing objects to reduce/stop memory leakage on generati...Justin Clark-Casey (justincc)2014-01-244-319/+343
| | | * Add "generate map" console command to allow manual regeneration and storage o...Justin Clark-Casey (justincc)2014-01-232-1/+19
| | * | Adds a configuration option to cannibalize bandwidth from theMic Bowman2014-01-203-0/+30
| | * | Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAt...dahlia2014-01-201-0/+73
| | * | rather than converting existing materials to assets, just retrieve them and m...dahlia2014-01-201-32/+12
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2014-01-2011-43/+467
| | |\ \
| | | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-204-3/+281
| | | |\ \
| | | | * | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-204-3/+281
| | | * | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-207-40/+186
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * Stop exceptions being generated on agent connection if a telehub object has b...Justin Clark-Casey (justincc)2014-01-207-40/+186
| | * | | add null texture entry face check before converting legacy materialsdahlia2014-01-201-2/+2
| | |/ /
| | * | update OpenMetaverse.StructuredData to git master (bf4e9f654ff99c85e20b53e56f...dahlia2014-01-202-117/+117
| | * | force SOG update when converting legacy materials to ensure changes are persi...dahlia2014-01-201-0/+2
| | * | delay texture entry parsing until absolutely necessary while converting legac...dahlia2014-01-201-4/+4
| | * | Add code to convert legacy materials stored in DynAttrs to new asset format a...dahlia2014-01-201-20/+102
| | * | Check agent permissions before modifying an object's materials. Also, when cr...Oren Hurvitz2014-01-201-10/+21
| | * | When asked to change the Material for one face, change only that face; not th...Oren Hurvitz2014-01-201-18/+5
| | * | Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-2012-453/+307
| | * | Renamed MaterialsDemoModule to MaterialsModuleOren Hurvitz2014-01-201-1/+1
| | * | - Materials: support the viewer removing the material (in which case matsMap[...Oren Hurvitz2014-01-201-35/+42
| | * | Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-182-20/+42
| | |\ \ | | | |/
| | | * Following on from 50ea2e0, only fetch scene presence for check if lightscript...Justin Clark-Casey (justincc)2014-01-181-17/+38
| | | * Fixed: Windlight functions caused an error if called when the script's owner ...Oren Hurvitz2014-01-181-3/+9
| | | * Revert "Fixed: Windlight functions caused an error if called when the script'...Justin Clark-Casey (justincc)2014-01-171-9/+3
| | | * minor: Add Ai Austin to additional OpenSim contributors by request as he has ...Justin Clark-Casey (justincc)2014-01-171-8/+3
| | | * Fixed: Windlight functions caused an error if called when the script's owner ...Oren Hurvitz2014-01-171-3/+9
| | * | Remove redundant methods in FlotsamAssetCacheJustin Clark-Casey (justincc)2014-01-181-10/+0
| | * | implement CoreAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-1/+2
| | * | implement GlynnTuckerAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-1/+1
| | * | Properly implement CenomeAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-2/+4
| | * | Simplify FlotsamAssetCache.CheckFromMemoryCache()Justin Clark-Casey (justincc)2014-01-181-6/+1
| | * | minor: Add method doc to IImproveAssetCacheJustin Clark-Casey (justincc)2014-01-181-1/+25
| | * | Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use us...Justin Clark-Casey (justincc)2014-01-181-33/+10
| | * | elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()Justin Clark-Casey (justincc)2014-01-181-50/+47
| | * | minor: reinsert some method doc back into IEntityTransferModuleJustin Clark-Casey (justincc)2014-01-171-0/+20