aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2014-02-0433-355/+611
|\ \
| * | Add "--no-objects" parameter to 'load oar'.Robert Adams2014-02-023-1/+9
| | |
| * | 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-023-18/+18
| | | | | | | | | | | | | | | existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity.
| * | Implement terrain merging in TerrainChannel.Robert Adams2014-02-026-54/+129
| | | | | | | | | | | | | | | | | | 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.
| * | Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this ↵dahlia2014-02-013-3/+64
| | | | | | | | | | | | is intended for use in region modules and is not exposed to scripts.
| * | In UuidGatherer, gather materials referenced in the prim's TextureEntryOren Hurvitz2014-02-011-2/+15
| | | | | | | | | | | | Signed-off-by: dahlia <dahlia@nomail>
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-317-151/+170
| |\ \ | | |/
| | * Make sure Web streams are disposed after useOren Hurvitz2014-01-316-53/+45
| | |
| | * Made error messages more consistentDavid Rowe2014-01-311-15/+15
| | |
| | * Replaced throwing exceptions with calls to Error()David Rowe2014-01-311-7/+9
| | |
| | * Replaced llSay()ing LSL errors with calls Error()David Rowe2014-01-311-9/+8
| | |
| | * Replaced LSLError() calls with calls to Error()David Rowe2014-01-311-15/+10
| | |
| | * Updated "deprecated" LSL errors to use Deprecrated()David Rowe2014-01-311-19/+11
| | |
| | * Updated "not implemented" LSL errors to use NotImplemented()David Rowe2014-01-311-4/+3
| | |
| | * Updated ShoutError() calls to use new LSL error methodsDavid Rowe2014-01-311-38/+27
| | |
| | * Updated methods for handling LSL script errors, deprecated, and not implementedDavid Rowe2014-01-311-7/+58
| | |
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-301-7/+22
| |\ \ | | |/
| | * Record whether login to home fails because no home set (UUID.Zero) or region ↵Justin Clark-Casey (justincc)2014-01-301-7/+22
| | | | | | | | | | | | not found.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-305-66/+80
| |\ \
| | * | BulletSim: default physical terrain implementation to heightmap.Robert Adams2014-01-293-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It originally looked like mesh terrain would perform better for vehicles but, after much use, heightmap is the clear winner. Force terrain implementation to heightmap if the physics region is larger than legacy region size. This solves running out of memory for very large regions.
| | * | 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
| | |\ \
| | * | | Actually make the parameter updates change the behavior ofMic Bowman2014-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | sun movement.
| * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-301-0/+33
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Add "show grid user" robust/standalone console command for debug purposes.Justin Clark-Casey (justincc)2014-01-301-0/+33
| | | | | | | | | | | | | | | | | | | | Shows all data on entries which match or start with a given ID. This would usually be a UUID.
| * | | clear land tainting when tested. Then testing, pass scene to LandObject as ↵Robert Adams2014-01-282-2/+6
| | |/ | |/| | | | | | | now needed to get region size
| * | 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.
* | | Dropping the rest of Avination's modified appearance code for core.Melanie2014-02-042-46/+339
|/ / | | | | | | Module to follow.
* | 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
| | |