aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-2818-477/+456
|\
| * 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
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-202-4/+6
| |\ \ | | |/
| | * Stop exceptions being generated on agent connection if a telehub object has b...Justin Clark-Casey (justincc)2014-01-202-4/+6
| * | Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-206-22/+21
| * | 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
| * | 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: since structs are values, assigning them to another variable copies it...Justin Clark-Casey (justincc)2014-01-171-1/+1
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-4/+4
| |\ \ | | |/
| | * Remove old IInterRegionComms and references. This hasn't been used since 200...Justin Clark-Casey (justincc)2014-01-162-4/+4
* | | Merge branch 'master' into careminsterMelanie2014-01-282-31/+36
|\ \ \ | |/ /
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-102-67/+56
| |\ \ | | |/
| | * When creating a coalesced object, set its permissions to the lowest-common-de...Oren Hurvitz2014-01-101-7/+16
| | * When creating a coalesced object, set its Creator ID if all the objects have ...Oren Hurvitz2014-01-101-4/+15
| | * Refactored: use a single function to apply an object's folded permissions to ...Oren Hurvitz2014-01-102-18/+10
| | * Refactored setting permissions when rezzing items: use the same function when...Oren Hurvitz2014-01-101-37/+14
* | | Intermediate commit. Sill errors.Melanie2014-01-053-30/+47
|\ \ \ | |/ /
| * | Some missing definitions needed for successful compilation.Robert Adams2014-01-041-1/+2
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-11/+21
| * | Fix issue with editing notes for other avatarsBlueWall2013-12-161-2/+2
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-16/+22
| |\ \ | | |/
| | * Make WindParamSet success a console message rather than a log message.Justin Clark-Casey (justincc)2013-12-141-2/+1
| | * minor: Make wind console commands print out to console rather than logJustin Clark-Casey (justincc)2013-12-141-14/+21
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-117-130/+631
| * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-111-217/+204
| |/
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-072-69/+0
* | Merge branch 'master' into careminsterMelanie2013-12-072-0/+69
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-062-0/+69
* | Merge branch 'master' into careminsterMelanie2013-11-2311-64/+146
|\ \ | |/
| * Fix false positive test failure in TestRepeatSameDrawContainingImageReusingTe...Justin Clark-Casey (justincc)2013-11-231-2/+2
| * minor: Use default(UUID) in rez attachment failure error logging rather than ...Justin Clark-Casey (justincc)2013-11-151-1/+1
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-158-14/+14
| * If a local land ID is given to the "land show" command, then output to consol...Justin Clark-Casey (justincc)2013-11-151-54/+126
* | Merge branch 'master' into careminsterMelanie2013-11-082-44/+76
|\ \ | |/
| * Make "fcache status" command also display information on disk/mem cache hit r...Justin Clark-Casey (justincc)2013-10-301-18/+38
| * Put fcache commands output to console, not logJustin Clark-Casey (justincc)2013-10-301-28/+25
| * Show texture ids for full object/part info console commmdsJustin Clark-Casey (justincc)2013-10-241-1/+16
* | Merge branch 'master' into careminsterMelanie2013-11-036-89/+80
|\ \ | |/
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-43/+8
| * Made terrain uploads thread-safeOren Hurvitz2013-10-153-22/+40
| * * Refactorteravus2013-10-072-4/+4
| * * Added a Basic DOS protection container/base object for the most common HTTP...teravus2013-10-072-3/+30
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-062-3/+8
|\ \