aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix displacement and location operations on legacy trees and grass inRobert Adams2014-02-151-1/+1
| | | | | the 'load oar' and 'scene' commands. Before they were ignored but the code now relies on the SOG.IsAttachment function for attachmentness.
* Properly restore position on crossing failure for mega-regions.Robert Adams2014-02-151-6/+15
| | | | | Fix odd "cannot cross into banned parcel" viewer error message when crossing into non-existant region. Proper permission failure messages are now returned.
* Rewrite of mega-region code to use new form of border checking.Robert Adams2014-02-151-34/+14
| | | | | | | This commit eliminates all of the 'border' class and list code and replaces it with testing if in the current region. Impacts: can make a mega-region out of varregions of the same size; and mega-region combinations must be rectangular (not square but rectangular)
* Non-functional changes of numbers into symbolic references and a fewRobert Adams2014-02-153-4/+5
| | | | comments on what variables really mean.
* Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-02-145-6/+54
|\
| * Change warns associated with UserAgentServiceConnector to debugs, as this is ↵Justin Clark-Casey (justincc)2014-02-145-5/+5
| | | | | | | | | | | | not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted). This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
| * If calls to UserAgentServiceConnector fail then throw an exception. This ↵Justin Clark-Casey (justincc)2014-02-145-6/+54
| | | | | | | | | | | | lets the caller decide whether to discard the error or not. This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
* | Remove the added whitespace, test concludedMelanie2014-02-041-1/+1
| |
* | Bot testMelanie2014-02-041-1/+1
| |
* | Remove compile error from returning value in void functionRobert Adams2014-02-031-1/+1
| |
* | Fix raw32 terrain heightmap reader so it estimates terrain size fromRobert Adams2014-02-032-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 ↵Melanie2014-02-041-1/+3
| | | | | | | | work when unconfigured :|
* | Adding the Avination XBakesModule, the client for the persistent bakes systemMelanie2014-02-041-0/+189
| |
* | Add "--no-objects" parameter to 'load oar'.Robert Adams2014-02-022-1/+7
| |
* | Really add the old parameter names to load oar to keep downward compatibiliyRobert Adams2014-02-021-0/+2
| |
* | Change new 'load oar' parameters to be hyphenated to be consistant withRobert Adams2014-02-022-10/+10
| | | | | | | | | | existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity.
* | Implement terrain merging in TerrainChannel.Robert Adams2014-02-023-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-313-47/+39
|\ \ | |/
| * Make sure Web streams are disposed after useOren Hurvitz2014-01-313-47/+39
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2014-01-281-17/+17
|\ \
| * | Restore brush tests with correct values and adjustments for new terrain heightRobert Adams2014-01-281-17/+17
| | | | | | | | | | | | rounding characteristics.
* | | One more run at fixing the sun module. Parameter setting fixed toMic Bowman2014-01-281-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 Adams2014-01-281-0/+2
| |
* | Change area of brush test to account for rounding errors in terrain ↵Robert Adams2014-01-281-2/+2
| | | | | | | | implementation
* | Increase the strength of brushes in brush test in an attempt to overcome ↵Robert Adams2014-01-281-2/+2
| | | | | | | | | | | | rounding introduced with new terrain height class.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2014-01-281-1/+1
|\ \
| * | clear land tainting when tested. Then testing, pass scene to LandObject as ↵Robert Adams2014-01-281-1/+1
| | | | | | | | | | | | now needed to get region size
* | | Actually make the parameter updates change the behavior ofMic Bowman2014-01-281-0/+4
|/ / | | | | | | sun movement.
* | Fix terrain tests by properly initializing low detail terrain to zero height.Robert Adams2014-01-282-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 gatedMic Bowman2014-01-281-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 andRobert Adams2014-01-263-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 varregionRobert Adams2014-01-264-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-244-320/+362
| |\ \ | | |/
| | * Properly dispose of drawing objects to reduce/stop memory leakage on ↵Justin Clark-Casey (justincc)2014-01-244-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-232-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 mergeRobert Adams2014-01-261-263/+271
| | | | | | | | | | | | with changes made in master.
* | | Merge branch 'master' into varregionRobert Adams2014-01-218-26/+27
|\ \ \ | |/ /
| * | 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 ↵Justin Clark-Casey (justincc)2014-01-202-4/+6
| | | | | | | | | | | | been deleted or has no spawn points.
| * | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-206-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 theRobert Adams2014-01-191-4/+0
| | | | | | | | | | | | maptile dir and causes errors.
* | | varregion: remove --noterrain and --noparcel parameters in 'load oar'.Robert Adams2014-01-192-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 Adams2014-01-193-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 Adams2014-01-194-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 varregionRobert Adams2014-01-197-108/+70
|\ \ \ | |/ /
| * | 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
| | |