Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into varregion | Robert Adams | 2013-11-24 | 19 | -8350/+8983 |
|\ | |||||
| * | Revert "Fix issue where sitting on non-root linked prims would send camera ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 2 | -14/+3 |
| | | | | | | | | | | | | | | | | to wrong position in third-person and mouselook" Reverting to place on separate branch This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a. | ||||
| * | Revert "Add line accidentally left out of recent non-root prim sit fix" | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -2/+0 |
| | | | | | | | | | | | | Reverting to place on new branch This reverts commit ed1029712a85206430fee1d4897d473517728dab. | ||||
| * | Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -2/+5 |
| | | | | | | | | | | | | is Vector3.Zero" This reverts commit 9bdd3dc7de46507b490a2eae5160123a28133d63. | ||||
| * | Revert "Fix non-root prim sit positions for prims where a sit target has ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | been specified as well." Revert to place on separate branch for now This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57. | ||||
| * | Revert "Refix fix for sitting on non-root linked prims with explicit sit ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -1/+1 |
| | | | | | | | | | | | | targets." This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb. | ||||
| * | Revert "fix avatar rotation when sitting on a linked part" | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Reverting for now to place on separate branch This reverts commit 65304260af283211443a2872c46f6609d3e45649. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -4/+5 |
| |\ | |||||
| | * | Fixed the update StoreRegionWindlightSettings() wasn't updating ↵ | Fernando Oliveira | 2013-11-22 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | regionwindlight table, raising PrimaryKey violation; Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br> Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com> | ||||
| * | | fix avatar rotation when sitting on a linked part | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -1/+1 |
| |/ | | | | | | | Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim | ||||
| * | Remove old *.exe.config files that related to programs that have long been ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 3 | -89/+0 |
| | | | | | | | | deleted or renamed | ||||
| * | Refix fix for sitting on non-root linked prims with explicit sit targets. | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -1/+1 |
| | | | | | | | | I forgot that m_post is being set inconsistently between non-explicit and explicit ragets | ||||
| * | Fix non-root prim sit positions for prims where a sit target has been ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -1/+1 |
| | | | | | | | | specified as well. | ||||
| * | Stop .NET 4 complaining on Windows when it tries to load in DLLs that ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 6 | -0/+8 |
| | | | | | | | | | | | | | | | | | | haven't been marked as trusted in the operating system. This is done by adding <loadFromRemoteSources enabled="true" /> to the execute *.config files. This tells .NET 4 to trust the DLLs, which is safe in our case since we are not loading DLLs from locations that untrusted users may specify Addresses http://opensimulator.org/mantis/view.php?id=6853 and http://opensimulator.org/mantis/view.php?id=6846 As far as I know, CAS policy checks have never been performed in Mono | ||||
| * | Add line accidentally left out of recent non-root prim sit fix | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -0/+2 |
| | | | | | | | | Original commit is ff4e7de7 | ||||
| * | Still send CameraEyeOffset in UDP SendSitReponse even if at offset is ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -5/+2 |
| | | | | | | | | | | | | Vector3.Zero As far as I can see it's valid to change the eye offset even if you aren't changing the at target. | ||||
| * | Fix false positive test failure in ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 1 | -2/+2 |
| | | | | | | | | | | | | TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up. Use 0.0.0.0 instead of localhost | ||||
| * | Fix issue where sitting on non-root linked prims would send camera to wrong ↵ | Justin Clark-Casey (justincc) | 2013-11-23 | 2 | -3/+14 |
| | | | | | | | | | | | | position in third-person and mouselook We now specify sits as offsets from the root prim, as the viewer expects. | ||||
| * | Added admin_authenticate_user command | Eva Comaroski | 2013-11-20 | 1 | -0/+136 |
| | | |||||
| * | Fix bug where "show modules" would accidentally list all the shared modules ↵ | Justin Clark-Casey (justincc) | 2013-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | again as "non-shared" Addresses http://opensimulator.org/mantis/view.php?id=6860 | ||||
| * | rename private field ACD.ViewerInternal to m_viewerInternal in line with ↵ | Justin Clark-Casey (justincc) | 2013-11-19 | 1 | -5/+6 |
| | | | | | | | | conventions used elsewhere in code | ||||
| * | Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has ↵ | Justin Clark-Casey (justincc) | 2013-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | been set. Continue to return null instead. | ||||
| * | Normalize viewer version string to accomodate new style version reporting in ↵ | Latif Khalifa | 2013-11-19 | 1 | -1/+24 |
| | | | | | | | | the viewers | ||||
| * | Add regression test to check that specifying a non-existent event raise a ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -0/+9 |
| | | | | | | | | | | | | syntax error This was the case before any of the recent changes | ||||
| * | Add syntax checking for no_sensor() no-arg event | Justin Clark-Casey (justincc) | 2013-11-16 | 2 | -4970/+4981 |
| | | |||||
| * | refactor common code out of no argument LSL event regression tests | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -14/+13 |
| | | |||||
| * | If anything other than a single integer is specified for events that only ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 2 | -8245/+8691 |
| | | | | | | | | | | | | take a single integer, generate a syntax error on LSL script compile rather than an exception later on. This applies to events changed, collision, collision_start, collision_end, on_rez, run_time_permissions, sensor, touch, touch_start, touch_end | ||||
| * | Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 2 | -7447/+7520 |
| | | | | | | | | | | | | | | and timer LSL events generate a syntax error if inappropriately given arguments. This matches behaviour seen on the LL grid and a previous change for state_entry. These are all the events which should take no arguments | ||||
| * | refactor LSL_EventTests.TestStateEntryEvent into single method to test compile | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -14/+17 |
| | | |||||
| * | Ignore *.suo and *.user as these are user specific preference files from ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -5/+6 |
| | | | | | | | | | | | | Visual Studio http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control | ||||
| * | minor: Add OpenSim.v11.suo to .gitignore file. | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -0/+4 |
| | | | | | | | | | | This is generated if a vs2010 OpenSim.sln is loaded into vs2012 As per http://opensimulator.org/mantis/view.php?id=6839 | ||||
| * | minor: Use default(UUID) in rez attachment failure error logging rather than ↵ | Justin Clark-Casey (justincc) | 2013-11-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | (UUID)null Patch from http://opensimulator.org/mantis/view.php?id=6843 Thanks Kira. | ||||
| * | If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase ↵ | Justin Clark-Casey (justincc) | 2013-11-15 | 1 | -6/+13 |
| | | | | | | | | | | | | | | folder when required, then don't try to store the null and perform other operations on it. Patch from http://opensimulator.org/mantis/view.php?id=6844 Thanks Kira. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-11-15 | 34 | -100/+171 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-11-15 | 3 | -0/+0 |
| |\ | |||||
| | * | update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope that it ↵ | dahlia | 2013-11-15 | 3 | -0/+0 |
| | | | | | | | | | | | | fixes some bulletsim issues on linux | ||||
| * | | refactor: replace verbose checks with String.IsNullOrEmpty where applicable. | Justin Clark-Casey (justincc) | 2013-11-15 | 30 | -47/+46 |
| |/ | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845 | ||||
| * | If a local land ID is given to the "land show" command, then output to ↵ | Justin Clark-Casey (justincc) | 2013-11-15 | 1 | -54/+126 |
| | | | | | | | | | | | | console the full details of that parcel. Using "land show" without a land ID still outputs a summary of parcels in the region | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-11-13 | 9 | -142/+285 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-11-13 | 5 | -126/+202 |
| |\ | |||||
| | * | Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions. | justincc | 2013-11-13 | 5 | -126/+202 |
| | | | | | | | | | | | | Also fixes some issues in associated solution files | ||||
| * | | Fix bug where removing a physical linkset would only decrement the Active ↵ | Justin Clark-Casey (justincc) | 2013-11-13 | 2 | -2/+73 |
| |/ | | | | | | | | | | | | | Objects statistic by 1 instead of by the number of prims removed. Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest. Added regression test for this case. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-11-13 | 1 | -3/+9 |
| |\ | |||||
| | * | Fix runprebuild.bat on Windows 7 systems and later | justincc | 2013-11-13 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | MS changed Windows 7 "reg query" command to spit out fewer lines in its preamble Annoyingly there is no option to print raw values and not this preamble. So now using the Windows find command. But this has the side effect of stopping this working with Cygwin as it uses its own GNU find command. Might fix in the future but not simple since Windows find itself is in different locations | ||||
| * | | Get runprebuild.sh to generate a vs2010 for xbuild to work with .NET 4 ↵ | Justin Clark-Casey (justincc) | 2013-11-13 | 1 | -11/+1 |
| |/ | | | | | | | | | | | rather than vs2008 At least since 2009, Monodevelop has been able to load vs2010 files as well | ||||
* | | varregion: extend TerrainModule to use the region size from RegionInfo | Robert Adams | 2013-11-10 | 1 | -14/+14 |
| | | | | | | | | | | rather than using Constants.RegionSize. This allows loading and saving of terrain heightmaps that match the size of non-legacy sized regions. | ||||
* | | varregion: fix GetLandObject error return and initialization of square | Robert Adams | 2013-11-10 | 3 | -12/+37 |
| | | | | | | | | | | | | land object bitmaps. This fixes creation of child presences and the editing of parcels. Also lots of commented out debugging messages. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-11-08 | 11 | -114/+206 |
|\ \ | |/ | |||||
| * | Add initial test for checking that specifying a parameter in LSL ↵ | Justin Clark-Casey (justincc) | 2013-11-09 | 1 | -0/+64 |
| | | | | | | | | | | | | state_entry() generates a syntax error. Same for other events to follow at a later date. | ||||
| * | minor: remove the bit left in the readme which said .net 3.5 framework was ↵ | Justin Clark-Casey (justincc) | 2013-11-08 | 1 | -2/+0 |
| | | | | | | | | required |