Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove the added whitespace, test concluded | Melanie | 2014-02-04 | 1 | -1/+1 |
| | |||||
* | Bot test | Melanie | 2014-02-04 | 1 | -1/+1 |
| | |||||
* | Remove compile error from returning value in void function | Robert Adams | 2014-02-03 | 1 | -1/+1 |
| | |||||
* | Fix raw32 terrain heightmap reader so it estimates terrain size from | Robert Adams | 2014-02-03 | 2 | -2/+13 |
| | | | | | | the size of the input stream. This is required since the raw heightmap format (.r32) does not contain any size information. The estimation relies on terrain being square. | ||||
* | Add one check for a blank URL because the module wasn't quite sure not to ↵ | Melanie | 2014-02-04 | 1 | -1/+3 |
| | | | | work when unconfigured :| | ||||
* | Adding the Avination XBakesModule, the client for the persistent bakes system | Melanie | 2014-02-04 | 1 | -0/+189 |
| | |||||
* | Add "--no-objects" parameter to 'load oar'. | Robert Adams | 2014-02-02 | 2 | -1/+7 |
| | |||||
* | Really add the old parameter names to load oar to keep downward compatibiliy | Robert Adams | 2014-02-02 | 1 | -0/+2 |
| | |||||
* | Change new 'load oar' parameters to be hyphenated to be consistant with | Robert Adams | 2014-02-02 | 2 | -10/+10 |
| | | | | | existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity. | ||||
* | Implement terrain merging in TerrainChannel. | Robert Adams | 2014-02-02 | 3 | -53/+53 |
| | | | | | | Modify archiver to use terrain merging when loading oars. This makes displacement AND rotation properly work on terrain when loading oars. Especially useful when loading legacy region oars into large varregions. | ||||
* | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-31 | 3 | -47/+39 |
|\ | |||||
| * | Make sure Web streams are disposed after use | Oren Hurvitz | 2014-01-31 | 3 | -47/+39 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2014-01-28 | 1 | -17/+17 |
|\ \ | |||||
| * | | Restore brush tests with correct values and adjustments for new terrain height | Robert Adams | 2014-01-28 | 1 | -17/+17 |
| | | | | | | | | | | | | rounding characteristics. | ||||
* | | | One more run at fixing the sun module. Parameter setting fixed to | Mic Bowman | 2014-01-28 | 1 | -52/+52 |
|/ / | | | | | | | | | | | work through the OSSL interface. And setting the parameters now adjusts all the dependent variables correctly so the sun moves at the modified rate. | ||||
* | | Temporarily disable brush test. It will come back when tuning is complete. | Robert Adams | 2014-01-28 | 1 | -0/+2 |
| | | |||||
* | | Change area of brush test to account for rounding errors in terrain ↵ | Robert Adams | 2014-01-28 | 1 | -2/+2 |
| | | | | | | | | implementation | ||||
* | | Increase the strength of brushes in brush test in an attempt to overcome ↵ | Robert Adams | 2014-01-28 | 1 | -2/+2 |
| | | | | | | | | | | | | rounding introduced with new terrain height class. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2014-01-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | clear land tainting when tested. Then testing, pass scene to LandObject as ↵ | Robert Adams | 2014-01-28 | 1 | -1/+1 |
| | | | | | | | | | | | | now needed to get region size | ||||
* | | | Actually make the parameter updates change the behavior of | Mic Bowman | 2014-01-28 | 1 | -0/+4 |
|/ / | | | | | | | sun movement. | ||||
* | | Fix terrain tests by properly initializing low detail terrain to zero height. | Robert Adams | 2014-01-28 | 2 | -5/+4 |
| | | | | | | | | Also remove PI heightmap test as new heightmaps only have two significant digits. | ||||
* | | Some major surgery on the sun module. Updates to the client were gated | Mic Bowman | 2014-01-28 | 1 | -51/+46 |
| | | | | | | | | | | | | | | by a "mode" check. That mode check has been removed (it didn't result in any change of behavior anyway). Also added a command line variable update to set the sun position time offset (offset from the system clock). Default is no offset to preserve existing behavior. | ||||
* | | varregion: enable teleporting to a varregion by clicking on the map and | Robert Adams | 2014-01-26 | 3 | -82/+168 |
| | | | | | | | | | | | | | | pressing the 'teleport' button. This commit adds returning region map info for all the subregions of a varregion. This also handles the selection of the extra region and then the displacement of the postion so the teleport is to the correct location. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2014-01-26 | 4 | -88/+117 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | ||||
| * \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-24 | 4 | -320/+362 |
| |\ \ | | |/ | |||||
| | * | Properly dispose of drawing objects to reduce/stop memory leakage on ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 4 | -319/+343 |
| | | | | | | | | | | | | generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults) | ||||
| | * | Add "generate map" console command to allow manual regeneration and storage ↵ | Justin Clark-Casey (justincc) | 2014-01-23 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | of maptiles Primarily for test purposes though could be useful if one prefers to manually update the map tile | ||||
* | | | 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 | 8 | -26/+27 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-20 | 2 | -4/+6 |
| |\ \ | | |/ | |||||
| | * | Stop exceptions being generated on agent connection if a telehub object has ↵ | Justin Clark-Casey (justincc) | 2014-01-20 | 2 | -4/+6 |
| | | | | | | | | | | | | been deleted or has no spawn points. | ||||
| * | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 6 | -22/+21 |
| | | | | | | | | | | | | | | | | | | "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'. | ||||
* | | | 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 | 2 | -17/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -24/+54 |
| | | | | | | | | | | | | | | | --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 | 4 | -15/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -108/+70 |
|\ \ \ | |/ / | |||||
| * | | 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: since structs are values, assigning them to another variable copies ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | it. Instantiation is unnecessary. | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | Remove old IInterRegionComms and references. This hasn't been used since ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -4/+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 | 1 | -0/+20 |
| | | |