aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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-282-2/+6
|\
| * clear land tainting when tested. Then testing, pass scene to LandObject as ↵Robert Adams2014-01-282-2/+6
| | | | | | | | 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-283-5/+5
| | | | Also remove PI heightmap test as new heightmaps only have two significant digits.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2014-01-285-4/+21
|\
| * Repair database routines so they properly return null when asked forRobert Adams2014-01-285-4/+21
| | | | | | | | the heighmap of a region that does not exist.
* | 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.
* Merge branch 'master' into varregionRobert Adams2014-01-286-43/+107
|\
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-284-24/+75
| |\
| | * Added osGetRegionSize(), which returns the region size in meters and ↵Oren Hurvitz2014-01-283-0/+29
| | | | | | | | | | | | recognizes megaregions
| | * Convert tabs to spaces from previous commit 8c2b41b01Justin Clark-Casey (justincc)2014-01-281-27/+27
| | |
| | * Make inidirectory files supercede distro filesDev Random2014-01-271-27/+49
| | |
| * | Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| | | | | | | | | | | | Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
| * | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which ↵Justin Clark-Casey (justincc)2014-01-271-2/+1
| | | | | | | | | | | | occur no matter which branch of the conditional is executed
| * | Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
| | |
* | | varregion: fix for teleporting by double clicking on a map location.Robert Adams2014-01-281-0/+13
| | | | | | | | | | | | Thanks Garmin.
* | | varregion: enable teleporting to a varregion by clicking on the map andRobert Adams2014-01-266-83/+221
| | | | | | | | | | | | | | | | | | | | | 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-265-109/+136
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-241-21/+19
| |\ \ | | |/
| | * minor: remove long unused state queue from "show queues" console reportsJustin Clark-Casey (justincc)2014-01-241-5/+3
| | |
| | * minor: correct the usage statement on the "show image queues" console ↵Justin Clark-Casey (justincc)2014-01-241-1/+1
| | | | | | | | | | | | command - should not have been "image queues show"
| | * Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) ↵Justin Clark-Casey (justincc)2014-01-241-15/+15
| | | | | | | | | | | | | | | | | | from the "show queues" console report to stop screwing up formatting. "show pquques" already did this
| * | 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.
* | | varregion: pass region size in more HG services.Robert Adams2014-01-243-1/+17
| | |
* | | Enable the simulator to handle region size information returned fromMic Bowman2014-01-231-0/+12
| | | | | | | | | | | | | | | a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side will be updated separately.
* | | Merge branch 'master' into varregionRobert Adams2014-01-2129-878/+1328
|\ \ \ | |/ /
| * | Adds a configuration option to cannibalize bandwidth from theMic Bowman2014-01-203-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | 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 ↵dahlia2014-01-201-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 ↵dahlia2014-01-201-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/opensimdahlia2014-01-2011-43/+467
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-204-3/+281
| | |\ \
| | | * | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-204-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-207-40/+186
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-207-40/+186
| | | | | | | | | | | | | | | | been deleted or has no spawn points.
| * | | add null texture entry face check before converting legacy materialsdahlia2014-01-201-2/+2
| |/ /
| * | update OpenMetaverse.StructuredData to git master ↵dahlia2014-01-202-117/+117
| | | | | | | | | | | | (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization to a standards compliant means of encoding floating point NaN and Infinity
| * | force SOG update when converting legacy materials to ensure changes are ↵dahlia2014-01-201-0/+2
| | | | | | | | | | | | persisted
| * | delay texture entry parsing until absolutely necessary while converting ↵dahlia2014-01-201-4/+4
| | | | | | | | | | | | legacy materials
| * | Add code to convert legacy materials stored in DynAttrs to new asset format ↵dahlia2014-01-201-20/+102
| | | | | | | | | | | | and store them as assets
| * | Check agent permissions before modifying an object's materials. Also, when ↵Oren Hurvitz2014-01-201-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 Hurvitz2014-01-201-18/+5
| | | | | | | | | | | | the default material