aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-208-22/+441
|\
| * 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-204-19/+160
| |\ \ | | |/ | |/|
| | * Stop exceptions being generated on agent connection if a telehub object has b...Justin Clark-Casey (justincc)2014-01-204-19/+160
* | | add null texture entry face check before converting legacy materialsdahlia2014-01-201-2/+2
|/ /
* | 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-209-446/+265
* | 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
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-181-12/+39
|\ \ | |/
| * 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
| * 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
* | 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
* | minor: since structs are values, assigning them to another variable copies it...Justin Clark-Casey (justincc)2014-01-171-1/+1
* | Reorder checks in SP.CompleteMovement() to fix test failuresJustin Clark-Casey (justincc)2014-01-161-36/+33
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-57/+68
|\ \ | |/
| * Actually put IsChildAgent = true inside the lock, otherwise there is still a ...Justin Clark-Casey (justincc)2014-01-161-1/+3
| * Prevent duplicate invocations or race dontision in SP.CompleteMovement()Justin Clark-Casey (justincc)2014-01-162-56/+65
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-164-127/+4
|\ \ | |/
| * Remove old IInterRegionComms and references. This hasn't been used since 200...Justin Clark-Casey (justincc)2014-01-164-127/+4
* | Fix crash in BulletSim which sometimes happens making a linkset physicalRobert Adams2014-01-101-7/+32
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-1/+1
|\ \ | |/
| * Fixed llTextBox error message textDavid Rowe2014-01-101-1/+1
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-5/+5
|\ \ | |/
| * Dynamically adjust to the number of visual params sent.Melanie2014-01-101-1/+1
| * When moving the root prim of an attachment: a) Change the attach position; b)...Oren Hurvitz2014-01-101-5/+5
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-106-138/+148
|\ \ | |/
| * 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-104-32/+24
| * Refactored setting permissions when rezzing items: use the same function when...Oren Hurvitz2014-01-104-94/+92
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-082-8/+19
|\ \ | |/
| * If an agent is sitting, then do send the rotation in the agent update instead...Justin Clark-Casey (justincc)2014-01-082-8/+19
* | Some missing definitions needed for successful compilation.Robert Adams2014-01-042-2/+4
* | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-045-34/+76