aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Bug fix in map teleports in varregions. The cherry was missing from the ↵Diva Canto2014-06-212-29/+2
| | | | ice-cream Sunday: the packet itself was hardcoding the size of the region...
* BulletSim: add some locking for collision lists to prevent collsionsRobert Adams2014-06-202-4/+15
| | | | from locking up when running BulletSim on a separate thread.
* Improved line map heuristics.Aleric Inglewood2014-06-191-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the C# column can't be found in the positionMap (but the line can), use the map immediately after it while correcting for the offset, unless that results in an LSL position before the previous LSL position in the positionMap. The idea behind this heuristic is that in most, if not all cases C# consumes more characters than LSL (for example LSL_Types.LSLInteger instead of just 'integer'). Thus if the distance between the columns of two markers differ in the C# and LSL file, the distance in the C# file will be larger. Moreover, we can assume that every time this happens we will have a marker at the beginning of the longer 'keyword', because those keywords were generated by us in the first place. For example: C#: LSL_Types.LSLInteger f2(LSL_Types.LSLString s) ^ ^ 1 2 will always have markers at the beginning of the long keywords 'LSL_Types.LSLInteger' and 'LSL_Types.LSLString'. If an error is generated in between (for example at the beginning of the function name 'f2') then the correct position is found by using an offset relative to 2 rather than 1. Note that a case where this isn't working correctly is when the user adds extra spaces. For example: LSL: integer f2( string s) would still use the start of 'string' as reference and then go backwards 3 characters only because the corresponding C# still looks like C#: LSL_Types.LSLInteger f2(LSL_Types.LSLString s) ^ ^ only 3 chars difference and the reported error at 'f2' would be here: LSL: integer f2( string s) ^ This can only be fixed by generating a mapping for 'f2' itself, or generating a mapping whenever the amount of spaces is changed.
* Fix looking up line number and colum when there is no exact match.Aleric Inglewood2014-06-191-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a compile error reports a colum/error that is not an exact match in the positionMap dictionary, the last position in the map with a line number and position before the reported error should be returned. The old code had the following problems: 1) It returns l,c - which are line and column of the C# file, not LSL. 2) It doesn't set l to 'line' when the map has an entry with 'line'. 3) It sorts the map without taking columns into account, which may result in a random order of the columns. With my mono implementation the columns were reversed in order. For example, if the map contains the following lines: 99,5,49,10 100,30,50,10 100,40,1,0 101,5,51,10 and a translation of 100,35 was requested, then the old code would compare '100' with the keys in the first column - setting l to that key while it is smaller. Hence, l is set to 99. Then it finds the key 100 and doesn't update l. Because of the reversed sort order, it first compares the column 35 with 40, finding that it is smaller and therefore it stops; returning 99,1 instead of finding the correct 100,30 entry and returning 50,10. This patch causes 50,10 to be returned. The remaining problems after this patch are: 1) The sorting might not be necessary at all. 2) The is code duplication (I fixed both instances, but really there should be no code duplication imho).
* BulletSim: stop processing linkset child when it is discovered that theRobert Adams2014-06-181-0/+1
| | | | child doesn't have a physical shape. Another attempt at fixing Mantis 7191.
* BulletSim: more tweeks to AliciaRaven's flying mods. Added parametersRobert Adams2014-06-182-11/+18
| | | | | | | AvatarFlyingGroundMargin and AvatarFlyingGroundUpForce set to 5.0 and 2.0 respectively which seems to give about the same action as in SL. Also moved force addition to before the velocity to force computation so the upward velocity is properly applied to the avatar mass.
* refactor: Simplify compilation result tests by factoring out common code.Justin Clark-Casey (justincc)2014-06-181-71/+45
|
* In compiler regression tests, setup and teardown structures for each test to ↵Justin Clark-Casey (justincc)2014-06-181-1/+5
| | | | avoid any possibility of inter-test inter-ference
* Fix issue with LSL jumps screwing up the C# compiler error -> LSL code ↵Justin Clark-Casey (justincc)2014-06-182-8/+55
| | | | | | | | position map and leading to invalid error line numbers/columns This is because jump statement generation was mistakenly inserting its own line without updating the csharp positions in CSCodeGenerator. This is Aleric Inglewood's patch in http://opensimulator.org/mantis/view.php?id=7195 but applied to opensim itself rather than the defunct code generation in opensim-libs. Thanks! This patch also adds a regression test for this case from myself.
* Fix previous commit to ignore water height and allow flying underwater ↵AliciaRaven2014-06-171-16/+1
| | | | | | (swimming) Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
* Add upward force to flight when close to the ground. Prevents current belly ↵AliciaRaven2014-06-171-0/+26
| | | | | | flop to the floor when flying with bullet physics and acts more like ODE and SL flight. Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
* Change assembly versions to 0.8.1Justin Clark-Casey (justincc)2014-06-1719-19/+19
|
* If MaterialsModule unexpected sees a part with DefaultTexture of null, log ↵Justin Clark-Casey (justincc)2014-06-161-0/+4
| | | | this with a warning.
* If processing a queued request fails up to the top of the stack, log the ↵Justin Clark-Casey (justincc)2014-06-161-3/+13
| | | | exception and move to the next request rather than terminate the simulator.
* In materials module, if a texture entry somehow has no default entry then ↵Justin Clark-Casey (justincc)2014-06-161-1/+2
| | | | don't try to extract materials data rather than throw an exception
* Behavior change: only local users can set home in any parcel of a grid. ↵Diva Canto2014-06-151-9/+11
| | | | Setting it for foreign users does not make sense, since cntrl+shift+H always teleports them back to their original grid.
* Manual change as per patch in mantis #7212. (the patch failed to apply, but ↵Diva Canto2014-06-151-1/+1
| | | | the fix was good) Thanks FreakyTech.
* Revert "Let HG users be gods too, if they have local permission to be so."Diva Canto2014-06-091-4/+7
| | | | | | | HG gods are not safe at this point. It's better to disallow this until they can be made safe. This reverts commit e86c765be3b0d94c94ff1c5f15a3949ecc857627.
* Let HG users be gods too, if they have local permission to be so.Diva Canto2014-06-091-7/+4
|
* BulletSim: fix exceptions while rebuilding linksets with mesh children.Robert Adams2014-06-081-3/+30
| | | | | | | This should get around the exception reported in Mantis 7191 and 7204 by checking for the unbuilt child and rebuilding the linkset the next tick. A warning message is output when this rebuild happens and this message is clamped to 10 times in case there is a problem with a loop.
* Added simulation version compatibility check so that agents coming from ↵Diva Canto2014-06-063-10/+32
| | | | 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
* Amend to previous commit -- write down the problematic Profile server URL.Diva Canto2014-06-051-0/+3
|
* May fix mantis #7133Diva Canto2014-06-051-7/+12
|
* Fix AutoBackupModule and include option to skip saving assets.AliciaRaven2014-06-042-3/+39
| | | | Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
* Send multiple terrain patches per terrain update packet if terrainRobert Adams2014-06-013-27/+118
| | | | | draw distance optimization is enabled. Makes terrain editting a lot snappier.
* Fixes a permissions bug where a user with group powers to always rez was not ↵Diva Canto2014-06-011-1/+5
| | | | being given permission to rez on group land.
* This may fix mantis #7200, but I am unable to test because I don't have any ↵Diva Canto2014-06-011-0/+1
| | | | old viewers around anymore.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-06-017-61/+306
|\
| * Modifications to debugging printouts. No functional changes.Robert Adams2014-05-313-16/+21
| |
| * varregion: More tweeking to only sending patches within avatar draw distance.Robert Adams2014-05-313-18/+20
| | | | | | | | Still has problems with child avatars.
| * varregion: send terrain patches from where the avatar outward if the parameterRobert Adams2014-05-313-35/+273
| | | | | | | | | | | | [Terrain]SendTerrainUpdatesByViewDistance=true. This tracks which patches have been sent to each client and outputs the patches as the avatar moves.
* | Fixed a few things pertaining to interfacing with the estate service. ↵Diva Canto2014-06-014-33/+34
|/ | | | | | Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector. Also added more packing/unpacking code.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-05-316-21/+63
|\
| * minor: rename velocidyDiff -> velocityDiffJustin Clark-Casey (justincc)2014-05-301-2/+2
| |
| * minor: Add some commented out logging to ↵Justin Clark-Casey (justincc)2014-05-301-0/+8
| | | | | | | | ScenePresence.SendTerseUpdateToAllClients() which is extremely helpful when investigating presence update triggers.
| * Fix issue with BulletSim avatar level flight jitter by commenting out ↵Justin Clark-Casey (justincc)2014-05-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | RawVelocity update threshold for now in BSCharacter.UpdateProperties(). For some reason as yet unidentified (feedback?) a threshold above 0.4 here causes the RawVelocity to move between a lower and upper bound rather than remaining constant. The RawVelocity increased until it triggered the threshold update, at which point it started to decrease until it again triggered the threshhold update. This delta-v was enough to exceed the checks in ScenePresence.SendTerseUpdateToAllClients() and produce jittery avatar flight because of the fluctuating velocity. With a threshold of 0.4 (or 0, as with ODE), the RawVelocity remains constant in BulletSim and so avatar flight becomes mostly smooth - remaining occasional glitches appear to be a result of errors in distance extraploation. There are no obvious problems with commenting out the threshold. Misterblue, if this is wrong or I've missed some subtlety here, please feel free to revert and/or correct. The same considerations may or may not apply to object velocity updates.
| * Fix bug where setting a parcel in a varregion for sale would make sale ↵Justin Clark-Casey (justincc)2014-05-301-10/+21
| | | | | | | | | | | | bitmap generation in WorldMapModule throw an exception on next startup. This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
| * Make RegionReady login disabled during initialization message a console ↵Justin Clark-Casey (justincc)2014-05-271-2/+4
| | | | | | | | | | | | messages instead of a warning message. Same justification as earlier commit 996a6c2. These are not warnings but should still be visible to the user at any log level.
| * In compiler tests, remove the ResolveEventHandlers after test exitJustin Clark-Casey (justincc)2014-05-271-3/+6
| |
| * Make CompilerTest add same AssemblyResolver as XEngine to see if this solves ↵Justin Clark-Casey (justincc)2014-05-271-1/+7
| | | | | | | | the issue with different AppDomain BaseDirectory in local and Jenkins test runs
| * Temporarily print regression TestCastAndConcatString() script compile errors ↵Justin Clark-Casey (justincc)2014-05-271-4/+5
| | | | | | | | | | | | out to console to get a handle on what's going wrong. Does not fail for me locally and I failed to notice this test was failing on Jenkins.
| * Update regression TestInventoryDescendentsFetch() to account for recent ↵Justin Clark-Casey (justincc)2014-05-271-1/+1
| | | | | | | | | | | | commit 1fa3a6f This was hidden in continuous integration because of another regression test issue.
* | Moved these two estate-related interfaces to the projects where they belong.Diva Canto2014-05-303-235/+1
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-05-271-14/+20
|\
| * BulletSim: add locking of PhysObjects while processing simulationRobert Adams2014-05-261-14/+20
| | | | | | | | | | step updates and collisions. This is an attempt to fix a crash reported by Justin when doing high velocity teleports.
* | Fixes a bug where map search results pertaining to varregions would only ↵Diva Canto2014-05-273-20/+33
|/ | | | send the SW-most corner of the varregions; the other areas, when clicked, would result a blue circle, meaning that the viewer didn't know about those areas. This is still not quite right, as all the areas appear to be in the same coordinates, but it's good enough for now.
* Don't report NPC presences.Diva Canto2014-05-261-1/+2
|
* When saving an OAR in "Publish" mode, also discard Group informationOren Hurvitz2014-05-262-4/+12
|
* Prevent login to a region if the Telehub or Landing Point are in a banned parcelOren Hurvitz2014-05-251-4/+33
|
* When taking an object into inventory, set the inventory item's "Next Owner" ↵Oren Hurvitz2014-05-251-0/+10
| | | | permissions according to the permissions of the items in the object