Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change new 'load oar' parameters to be hyphenated to be consistant with | Robert Adams | 2014-02-02 | 3 | -18/+18 |
| | | | | | 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 | 6 | -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 ↵ | dahlia | 2014-02-01 | 3 | -3/+64 |
| | | | | is intended for use in region modules and is not exposed to scripts. | ||||
* | In UuidGatherer, gather materials referenced in the prim's TextureEntry | Oren Hurvitz | 2014-02-01 | 1 | -2/+15 |
| | | | | Signed-off-by: dahlia <dahlia@nomail> | ||||
* | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-31 | 7 | -151/+170 |
|\ | |||||
| * | Make sure Web streams are disposed after use | Oren Hurvitz | 2014-01-31 | 6 | -53/+45 |
| | | |||||
| * | Made error messages more consistent | David Rowe | 2014-01-31 | 1 | -15/+15 |
| | | |||||
| * | Replaced throwing exceptions with calls to Error() | David Rowe | 2014-01-31 | 1 | -7/+9 |
| | | |||||
| * | Replaced llSay()ing LSL errors with calls Error() | David Rowe | 2014-01-31 | 1 | -9/+8 |
| | | |||||
| * | Replaced LSLError() calls with calls to Error() | David Rowe | 2014-01-31 | 1 | -15/+10 |
| | | |||||
| * | Updated "deprecated" LSL errors to use Deprecrated() | David Rowe | 2014-01-31 | 1 | -19/+11 |
| | | |||||
| * | Updated "not implemented" LSL errors to use NotImplemented() | David Rowe | 2014-01-31 | 1 | -4/+3 |
| | | |||||
| * | Updated ShoutError() calls to use new LSL error methods | David Rowe | 2014-01-31 | 1 | -38/+27 |
| | | |||||
| * | Updated methods for handling LSL script errors, deprecated, and not implemented | David Rowe | 2014-01-31 | 1 | -7/+58 |
| | | |||||
* | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-30 | 1 | -7/+22 |
|\ \ | |/ | |||||
| * | Record whether login to home fails because no home set (UUID.Zero) or region ↵ | Justin Clark-Casey (justincc) | 2014-01-30 | 1 | -7/+22 |
| | | | | | | | | not found. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2014-01-30 | 5 | -66/+80 |
|\ \ | |||||
| * | | BulletSim: default physical terrain implementation to heightmap. | Robert Adams | 2014-01-29 | 3 | -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/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 | 2 | -2/+6 |
| |\ \ | |||||
| * | | | Actually make the parameter updates change the behavior of | Mic Bowman | 2014-01-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | sun movement. | ||||
* | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-30 | 1 | -0/+33 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Add "show grid user" robust/standalone console command for debug purposes. | Justin Clark-Casey (justincc) | 2014-01-30 | 1 | -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 Adams | 2014-01-28 | 2 | -2/+6 |
| |/ |/| | | | | | now needed to get region size | ||||
* | | Fix terrain tests by properly initializing low detail terrain to zero height. | Robert Adams | 2014-01-28 | 3 | -5/+5 |
| | | | | | | | | Also remove PI heightmap test as new heightmaps only have two significant digits. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2014-01-28 | 5 | -4/+21 |
|\ \ | |||||
| * | | Repair database routines so they properly return null when asked for | Robert Adams | 2014-01-28 | 5 | -4/+21 |
| | | | | | | | | | | | | the heighmap of a region that does not exist. | ||||
* | | | 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. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2014-01-28 | 6 | -43/+107 |
|\ \ | |||||
| * \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-28 | 4 | -24/+75 |
| |\ \ | | |/ | |||||
| | * | Added osGetRegionSize(), which returns the region size in meters and ↵ | Oren Hurvitz | 2014-01-28 | 3 | -0/+29 |
| | | | | | | | | | | | | recognizes megaregions | ||||
| | * | Convert tabs to spaces from previous commit 8c2b41b01 | Justin Clark-Casey (justincc) | 2014-01-28 | 1 | -27/+27 |
| | | | |||||
| | * | Make inidirectory files supercede distro files | Dev Random | 2014-01-27 | 1 | -27/+49 |
| | | | |||||
| * | | Reinsert attachments list taking code in SP.MakeRootAgent() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -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-27 | 1 | -2/+1 |
| | | | | | | | | | | | | occur no matter which branch of the conditional is executed | ||||
| * | | Re-enabled NPCModuleTests.TestCreate() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -3/+1 |
| | | | |||||
* | | | varregion: fix for teleporting by double clicking on a map location. | Robert Adams | 2014-01-28 | 1 | -0/+13 |
| | | | | | | | | | | | | Thanks Garmin. | ||||
* | | | varregion: enable teleporting to a varregion by clicking on the map and | Robert Adams | 2014-01-26 | 6 | -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 varregion | Robert Adams | 2014-01-26 | 5 | -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-24 | 1 | -21/+19 |
| |\ \ | | |/ | |||||
| | * | minor: remove long unused state queue from "show queues" console reports | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -5/+3 |
| | | | |||||
| | * | minor: correct the usage statement on the "show image queues" console ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -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-24 | 1 | -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-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) |