Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | varregion: modify MapImageModule structure so it will better merge | Robert Adams | 2014-01-26 | 1 | -263/+271 |
| | | | | with changes made in master. | ||||
* | Merge branch 'master' into varregion | Robert Adams | 2014-01-21 | 20 | -733/+1133 |
|\ | |||||
| * | Adds a configuration option to cannibalize bandwidth from the | Mic Bowman | 2014-01-20 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | udp texture throttle and move it to the task throttle. Since most viewers are using http textures, the udp texture throttle is holding onto bw that could be used for more responsive prims updates. See the documentation for CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default. | ||||
| * | Add back code to UuidGatherer to retrieve UUIDs for materials stored in ↵ | dahlia | 2014-01-20 | 1 | -0/+73 |
| | | | | | | | | DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented | ||||
| * | 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 | ||||
* | | | varregion: remove debugging splat file saving that fills up the | Robert Adams | 2014-01-19 | 1 | -4/+0 |
| | | | | | | | | | | | | maptile dir and causes errors. | ||||
* | | | varregion: remove --noterrain and --noparcel parameters in 'load oar'. | Robert Adams | 2014-01-19 | 3 | -21/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --forceterrain and --forceparcel to 'load oar'. In order to not change the operation of --merge (which does an object merge and suppresses terrain and parcel information loading), added the --force* parameters to be used when loading multiple oars to build up a varregion. Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to the loaded oar objects before displacing. The rotation is in degrees (pos or neg) and the center defaults to "<128, 128, 0>". | ||||
* | | | varregion: add --noterrain and --noparcel to 'load oar'. | Robert Adams | 2014-01-19 | 5 | -44/+66 |
| | | | | | | | | | | | | | | | --noterrain suppresses the loading of the terrain from the oar. --noparcels suppresses the loading of parcel information from the oar. | ||||
* | | | varregion: add --displacement parameter to 'load oar'. | Robert Adams | 2014-01-19 | 7 | -19/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds displacment to all objects and terrain loaded from the oar. As an example, if you have a 512x512 region and an old 256x256 oar, doing load oar --displacement "<128,128,0>" oarFile.oar will load the object (and terrain) into the middle of the 512x512 region. If displacement is not specified, 'load oar' works like it always has. If you have a 5 | ||||
* | | | Merge branch 'master' into varregion | Robert Adams | 2014-01-19 | 13 | -329/+223 |
|\ \ \ | |/ / | |||||
| * | | 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 | ||||
* | | | varregion: Update Warp3D to properly handle varregions. | Robert Adams | 2014-01-19 | 3 | -265/+420 |
| | | | | | | | | | | | | | | | | | | | | | This includes additions to Warp3D: Optional rendering of mesh and scupltie prims (INI parameter. Off by default) Texturing of large prims (INI parameter. On by default) Better garbage collection | ||||
* | | | Add J2K decoder routine that converts directly to an image. | Robert Adams | 2014-01-19 | 2 | -1/+29 |
| | | | |||||
* | | | varregion: split up generated maptile images for storage in map. This | Robert Adams | 2014-01-19 | 2 | -22/+68 |
| | | | | | | | | | | | | makes maps for varregions show up properly. | ||||
* | | | varregion: properly pack the region size parameters so he viewer will parse ↵ | Robert Adams | 2014-01-11 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | them. This gets rid of the viewer crash when teleporting into varregions and allows multiple, adjacent varregions (of the same size) with border crossings. | ||||
* | | | varregion: Debug messages for region crossing debugging. | Robert Adams | 2014-01-11 | 2 | -12/+23 |
| | | | |||||
* | | | varregion: remove unnecessary border checking code in ScenePresence. | Robert Adams | 2014-01-11 | 1 | -0/+6 |
| | | |