aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Change terrain update sending to be triggered by frame tick ratherRobert Adams2014-03-101-50/+92
| | | | | | | | | | | | | | | | | | than everytime terrain is changed. The TerrainModule now hooks the frame event and, if terrain has changed, sends terrain updates to the clients. This polling pattern replaces the previous push on change pattern and will make it easier to do per client throttling and per scene presence terrain update ordering.
* | Instead of auto-creating a parcel on request if one doesn't cover a given ↵Justin Clark-Casey (justincc)2014-03-112-67/+211
|/ | | | | | | | | location, fill in gaps or extend existing parcel right after initial data load. This is in line with simpler and still existing behaviour where a default parcel is created if no parcels are in storage at all. Making this change as another step to address current problems with spurious parcels occasionally being created. Also adds regression tests for different load behaviours depending on existing stored parcel data. Relates to http://opensimulator.org/mantis/view.php?id=7035
* Remove try/catch in LandManagmentModule.GetLandObject() - this is very old ↵Justin Clark-Casey (justincc)2014-03-071-70/+51
| | | | code and the caught exceptions can no longer occur.
* Lock m_landlist whilst loading parcels from storage to prevent a race ↵Justin Clark-Casey (justincc)2014-03-071-7/+18
| | | | against any parcel auto-creation in GetLandObject()
* Only auto-create a land parcel when there is none in a specified tile if ↵Justin Clark-Casey (justincc)2014-03-071-1/+13
| | | | | | | there is more than 1 existing land parcel. This is because there are still issues with bad parcels being generated in http://opensimulator.org/mantis/view.php?id=7035 Theorizing now that it's possible that something is calling GetParcel() before any parcel data has been loaded from persistence.
* Add scene name to bad parcel add loggingJustin Clark-Casey (justincc)2014-03-061-2/+3
|
* refactor: Simplify land object by using c# get/set auto-properties where ↵Justin Clark-Casey (justincc)2014-03-061-23/+13
| | | | applicable.
* minor: slightly simplify code in LandObject.ContainsPoint()Justin Clark-Casey (justincc)2014-03-061-1/+1
|
* Remove array initialize calls in LMM - these are unnecessary as the VM ↵Justin Clark-Casey (justincc)2014-03-061-4/+0
| | | | already does this.
* minor: Increase size of parcel name field in "land show" console command ↵Justin Clark-Casey (justincc)2014-03-061-12/+12
| | | | output. Construct table using CDT rather than string formats
* Prevent adding a land object if it overlaps any existing objects that have ↵Justin Clark-Casey (justincc)2014-03-062-19/+190
| | | | | | | | not had their bitmaps adjusted. This is to prevent an immediate problem in http://opensimulator.org/mantis/view.php?id=7035 where a development code bug occasionally overlays all the existing parcels with a blank parcel owned by the estate manager and to gather more data. My guess is that this parcel is being created by the new code in LandManagementModule.GetLandObject(), probably some race between threads since this only happens occasionally. Adds regression tests for this case and for parcel subdivide.
* Maybe slightly reduce warp3d memory leakage by disposing of decoded bitmap ↵Justin Clark-Casey (justincc)2014-02-281-8/+6
| | | | | | in Warp3DImageModule.GetTexture() However, this still appears to be leaking massively, at least for me. Possible cause is warp3D using GDI objects internally and not disposing of them.
* If texture decode fails in Warp3D map maker, log uuid of asset that failed ↵Justin Clark-Casey (justincc)2014-02-201-1/+14
| | | | to decode along with exception
* 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.
* Non-functional changes of numbers into symbolic references and a fewRobert Adams2014-02-151-1/+1
| | | | comments on what variables really mean.
* 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 "--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-311-1/+1
|\
| * Make sure Web streams are disposed after useOren Hurvitz2014-01-311-1/+1
| |
* | 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-262-79/+140
| | | | | | | | | | | | | | 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-214-16/+17
|\ \ \ | |/ /
| * | 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-202-12/+11
| | | | | | | | | | | | | | | | | | "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
* | | varregion: Update Warp3D to properly handle varregions.Robert Adams2014-01-192-260/+417
| | | | | | | | | | | | | | | | | | | | | 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
* | | varregion: split up generated maptile images for storage in map. ThisRobert Adams2014-01-191-1/+1
| | | | | | | | | | | | makes maps for varregions show up properly.
* | | Merge branch 'master' into varregionRobert Adams2014-01-111-7/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneBase.cs OpenSim/Services/Interfaces/IGridService.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs (conflicts were debug statements that are commented out in master branch)