aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-07-044-4/+129
|\
| * minor: put standard 'category' in brackets at front of log messages from ↵Justin Clark-Casey (justincc)2014-07-041-2/+8
| | | | | | | | previous commit 3d70db4a
| * When uploading mesh objects with textures also create inventory items for ↵Latif Khalifa2014-07-041-0/+63
| | | | | | | | | | | | | | uploaded textures. This implements: http://opensimulator.org/mantis/view.php?id=7250
| * Include option to remove auto backup files older than given number of days. ↵AliciaRaven2014-07-042-2/+52
| | | | | | | | New property created to specify how many days to keep files for. Off by default, also made sure only oar files will be removed.
| * Still log (but this time with warning rather than an exception) if we ↵Justin Clark-Casey (justincc)2014-07-041-2/+8
| | | | | | | | | | | | | | regenerate a new child caps seed for a region where we already have one. I think it's still useful to know this to show up any errors early, but it's reasonable to still carry on rather than throw an exception. Follow on from Diva's commit 9643792
* | Instrument the UDP path of creating assets so that it triggers an asset post ↵Diva Canto2014-07-042-5/+11
|/ | | | for users with different asset servers
* On logout, delay the removal of AgentCircuitData until the very end, because ↵Diva Canto2014-07-041-5/+3
| | | | that data structure contains important information about the agent that may be needed by modules.
* This fixes the bug related to rebooting neighboring varregions while avatars ↵Diva Canto2014-07-041-10/+14
| | | | are logged in; the avies would not see the region anymore until they relogged. Same problem as before: inconsistent calculation of scope.
* It turns out that child agent management has had a bug for a while: there ↵Diva Canto2014-07-042-4/+12
| | | | was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-07-0313-53/+394
|\
| * Temporarily disable new regression test TestLifecycle() until I have a ↵Justin Clark-Casey (justincc)2014-07-031-1/+1
| | | | | | | | | | | | chance to fix it This was working for me locally because it was still picking up all my *.ini config files, which jenkins won't have in its test env
| * Re-enabled TestLifecycle regression test logging so I can get some idea of ↵Justin Clark-Casey (justincc)2014-07-031-1/+1
| | | | | | | | why it's failing on jenkins but not locally
| * Actually call Close() for shared region modules when the simulator is being ↵Justin Clark-Casey (justincc)2014-07-029-49/+361
| | | | | | | | | | | | shutdown. Adds regression test for this case.
| * minor: Change default max phys prim size in code to match OpenSimDefaults.iniJustin Clark-Casey (justincc)2014-06-281-1/+1
| |
| * minor: change allow script crossings default in code to true in order to ↵Justin Clark-Casey (justincc)2014-06-281-1/+1
| | | | | | | | match OpenSimDefaults.ini
| * add LSL constant PRIM_ALPHA_MODEdahlia2014-06-271-0/+1
| |
| * Bulletsim: Create AvatarTerminalVelocity to BulletSim like what ODE and SL ↵Vegaslon2014-06-273-2/+30
| | | | | | | | has. Before this falling from really high caused the avatar to fall faster then the veiwer can handle and cause camera issues.
* | Avoid an exception in creating child agents some times.Diva Canto2014-07-031-0/+2
|/
* add LSL constants PRIM_SPECULAR and PRIM_NORMALdahlia2014-06-231-0/+2
|
* 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-192-32/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-192-41/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1761-61/+61
|
* Update dev version to 0.8.1Justin Clark-Casey (justincc)2014-06-171-1/+1
|
* 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.
* Add [Startup]LogShowStatsSeconds=n parameter which controls the intervalRobert Adams2014-06-132-2/+16
| | | | | that simulator statistics is output to the console. Setting to zero turns stats logging off.
* Add rc3 flavour optionJustin Clark-Casey (justincc)2014-06-101-0/+1
|
* 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
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-06-082-5/+36
|\
| * Add [Terrain]SendTerrainUpdatesByViewDistance=false to OpenSimDefaults.iniRobert Adams2014-06-081-1/+5
| | | | | | | | so people can find the setting.
| * 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.
| * fix the comment section of max_distance setting to reflect default valueMichael Cerquoni2014-06-061-1/+1
| |
* | Don't try to package null invites.Diva Canto2014-06-081-1/+5
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-06-061-1/+1
|\
| * bump default teleport limit to 65535 regionsMichael Cerquoni2014-06-061-1/+1
| |
* | Missed this ini change in previous commitDiva Canto2014-06-061-2/+6
|/
* Added simulation version compatibility check so that agents coming from ↵Diva Canto2014-06-0610-23/+67
| | | | 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.