| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | rather than converting existing materials to assets, just retrieve them and ↵ | dahlia | 2014-01-20 | 1 | -32/+12 |
| | | | | | make them available for viewing. Any new materials added to the scene will become assets. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2014-01-20 | 8 | -22/+441 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2014-01-20 | 4 | -3/+281 |
| | |\ | |||||
| | | * | Clean up orphaned json stores. This can happen when an object is | Mic Bowman | 2014-01-20 | 4 | -3/+281 |
| | | | | | | | | | | | | | | | | | | | removed, when a script is removed, or when a script is reset. Also added a stats command to track the number of json stores used by a region. Will probably add some more commands later. | ||||
| | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-20 | 4 | -19/+160 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Stop exceptions being generated on agent connection if a telehub object has ↵ | Justin Clark-Casey (justincc) | 2014-01-20 | 4 | -19/+160 |
| | | | | | | | | | | | | | been deleted or has no spawn points. | ||||
| * | | | add null texture entry face check before converting legacy materials | dahlia | 2014-01-20 | 1 | -2/+2 |
| |/ / | |||||
| * | | force SOG update when converting legacy materials to ensure changes are ↵ | dahlia | 2014-01-20 | 1 | -0/+2 |
| | | | | | | | | | persisted | ||||
| * | | delay texture entry parsing until absolutely necessary while converting ↵ | dahlia | 2014-01-20 | 1 | -4/+4 |
| | | | | | | | | | legacy materials | ||||
| * | | Add code to convert legacy materials stored in DynAttrs to new asset format ↵ | dahlia | 2014-01-20 | 1 | -20/+102 |
| | | | | | | | | | and store them as assets | ||||
| * | | Check agent permissions before modifying an object's materials. Also, when ↵ | Oren Hurvitz | 2014-01-20 | 1 | -10/+21 |
| | | | | | | | | | creating a Material asset, set the current agent as the Creator. | ||||
| * | | When asked to change the Material for one face, change only that face; not ↵ | Oren Hurvitz | 2014-01-20 | 1 | -18/+5 |
| | | | | | | | | | the default material | ||||
| * | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 9 | -446/+265 |
| | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'. | ||||
| * | | Renamed MaterialsDemoModule to MaterialsModule | Oren Hurvitz | 2014-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | - Materials: support the viewer removing the material (in which case ↵ | Oren Hurvitz | 2014-01-20 | 1 | -35/+42 |
| | | | | | | | | | matsMap["Material"] is missing) - Reduced logging | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -12/+39 |
| |\ \ | |/ | |||||
| | * | Following on from 50ea2e0, only fetch scene presence for check if ↵ | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -17/+38 |
| | | | | | | | | | lightscript function has failed initial IsEstateManagerOrOwner() check | ||||
| | * | Fixed: Windlight functions caused an error if called when the script's owner ↵ | Oren Hurvitz | 2014-01-18 | 1 | -3/+9 |
| | | | | | | | | | isn't in the scene | ||||
| | * | Revert "Fixed: Windlight functions caused an error if called when the ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -9/+3 |
| | | | | | | | | | | | | | | | | | script's owner isn't in the scene" This reverts commit 39e5785c0f5bfa9fce2549757ac895920c88825a. Did not mean to apply this yet. | ||||
| | * | Fixed: Windlight functions caused an error if called when the script's owner ↵ | Oren Hurvitz | 2014-01-17 | 1 | -3/+9 |
| | | | | | | | | | isn't in the scene | ||||
| * | | Remove redundant methods in FlotsamAssetCache | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -10/+0 |
| | | | |||||
| * | | implement CoreAssetCache.Check() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -1/+2 |
| | | | |||||
| * | | implement GlynnTuckerAssetCache.Check() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -1/+1 |
| | | | |||||
| * | | Properly implement CenomeAssetCache.Check() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -2/+4 |
| | | | |||||
| * | | Simplify FlotsamAssetCache.CheckFromMemoryCache() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -6/+1 |
| | | | |||||
| * | | Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use ↵ | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -33/+10 |
| | | | | | | | | | using() construct to ensure filestream is always closed | ||||
| * | | elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -50/+47 |
| | | | | | | | | | Passed in asset is always not null | ||||
| * | | minor: reinsert some method doc back into IEntityTransferModule | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -0/+20 |
| | | | |||||
| * | | minor: since structs are values, assigning them to another variable copies ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -1/+1 |
| | | | | | | | | | it. Instantiation is unnecessary. | ||||
| * | | Reorder checks in SP.CompleteMovement() to fix test failures | Justin Clark-Casey (justincc) | 2014-01-16 | 1 | -36/+33 |
| | | | |||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -57/+68 |
| |\ \ | |/ | |||||
| | * | Actually put IsChildAgent = true inside the lock, otherwise there is still a ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 1 | -1/+3 |
| | | | | | | | | | small window for race conditions on duplicate CompleteMovement calls | ||||
| | * | Prevent duplicate invocations or race dontision in SP.CompleteMovement() | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -56/+65 |
| | | | | | | | | | | | This can happen under poor network conditions if a viewer repeats the message send If this happens, physics actors can get orphaned, which unecessarily raises physics frame times | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-16 | 4 | -127/+4 |
| |\ \ | |/ | |||||
| | * | Remove old IInterRegionComms and references. This hasn't been used since ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 4 | -127/+4 |
| | | | | | | | | | 2009 and was superseded by ISimulationService | ||||
| * | | Fix crash in BulletSim which sometimes happens making a linkset physical | Robert Adams | 2014-01-10 | 1 | -7/+32 |
| | | | | | | | | | | | | | (like sitting on and activating a vehicle) and crossing borders. This keeps better bookkeeping on compound shapes so BulletSim can identify them when being freed. | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Fixed llTextBox error message text | David Rowe | 2014-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 1 | -5/+5 |
| |\ \ | |/ | |||||
| | * | Dynamically adjust to the number of visual params sent. | Melanie | 2014-01-10 | 1 | -1/+1 |
| | | | |||||
| | * | When moving the root prim of an attachment: a) Change the attach position; ↵ | Oren Hurvitz | 2014-01-10 | 1 | -5/+5 |
| | | | | | | | | | b) Move the other prims in the reverse direction to compensate | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 6 | -138/+148 |
| |\ \ | |/ | |||||
| | * | When creating a coalesced object, set its permissions to the ↵ | Oren Hurvitz | 2014-01-10 | 1 | -7/+16 |
| | | | | | | | | | lowest-common-denominator of all the sub-objects | ||||
| | * | When creating a coalesced object, set its Creator ID if all the objects have ↵ | Oren Hurvitz | 2014-01-10 | 1 | -4/+15 |
| | | | | | | | | | the same creator | ||||
| | * | Refactored: use a single function to apply an object's folded permissions to ↵ | Oren Hurvitz | 2014-01-10 | 4 | -32/+24 |
| | | | | | | | | | its main permissions | ||||
| | * | Refactored setting permissions when rezzing items: use the same function ↵ | Oren Hurvitz | 2014-01-10 | 4 | -94/+92 |
| | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.) | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-08 | 2 | -8/+19 |
| |\ \ | |/ | |||||
| | * | If an agent is sitting, then do send the rotation in the agent update ↵ | Justin Clark-Casey (justincc) | 2014-01-08 | 2 | -8/+19 |
| | | | | | | | | | | | | | | | | | instead of zeroing it to resolve mouselook camera problems Addresses http://opensimulator.org/mantis/view.php?id=6892 Thanks to tglion for this spot. This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7 | ||||
| * | | Some missing definitions needed for successful compilation. | Robert Adams | 2014-01-04 | 2 | -2/+4 |
| | | | |||||
| * | | varregion: Add region size to teleport event messages (EnableSimulator, | Robert Adams | 2014-01-04 | 5 | -34/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |