3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
60e049ea39
Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook"
...
Reverting to place on separate branch
This reverts commit ff4e7de776
2013-11-23 02:31:39 +00:00
1999b218fd
Revert "Add line accidentally left out of recent non-root prim sit fix"
...
Reverting to place on new branch
This reverts commit ed1029712a
2013-11-23 02:31:17 +00:00
a68d1fad73
Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero"
...
This reverts commit 9bdd3dc7de
2013-11-23 02:29:14 +00:00
eb172be541
Revert "Fix non-root prim sit positions for prims where a sit target has been specified as well."
...
Revert to place on separate branch for now
This reverts commit 70e651a8d1
2013-11-23 02:28:30 +00:00
910f07dffa
Revert "Refix fix for sitting on non-root linked prims with explicit sit targets."
...
This reverts commit 78649eb099
2013-11-23 02:27:26 +00:00
5aa3236ebe
Revert "fix avatar rotation when sitting on a linked part"
...
Reverting for now to place on separate branch
This reverts commit 65304260af
2013-11-23 02:27:03 +00:00
b9e42aeb6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-23 02:09:54 +00:00
65304260af
fix avatar rotation when sitting on a linked part
...
Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
2013-11-23 02:09:03 +00:00
f3f3d390f7
Fixed the update StoreRegionWindlightSettings() wasn't updating regionwindlight table, raising PrimaryKey violation;
...
Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-22 20:48:12 -05:00
8217b52d3a
Remove old *.exe.config files that related to programs that have long been deleted or renamed
2013-11-23 01:40:48 +00:00
78649eb099
Refix fix for sitting on non-root linked prims with explicit sit targets.
...
I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
2013-11-23 01:35:08 +00:00
70e651a8d1
Fix non-root prim sit positions for prims where a sit target has been specified as well.
2013-11-23 01:32:29 +00:00
bd5c414618
Stop .NET 4 complaining on Windows when it tries to load in DLLs that 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
2013-11-23 01:29:55 +00:00
ed1029712a
Add line accidentally left out of recent non-root prim sit fix
...
Original commit is ff4e7de7
2013-11-23 01:18:07 +00:00
9bdd3dc7de
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is 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.
2013-11-23 01:12:20 +00:00
9f4a548a49
Fix false positive test failure in TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up.
...
Use 0.0.0.0 instead of localhost
2013-11-23 01:04:31 +00:00
ff4e7de776
Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook
...
We now specify sits as offsets from the root prim, as the viewer expects.
2013-11-23 00:53:09 +00:00
c896b4179e
Added admin_authenticate_user command
2013-11-20 00:09:32 +00:00
b44c69807d
Fix bug where "show modules" would accidentally list all the shared modules again as "non-shared"
...
Addresses http://opensimulator.org/mantis/view.php?id=6860
2013-11-19 23:53:15 +00:00
f9984a9685
rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code
2013-11-19 23:39:52 +00:00
b71952df49
Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has been set.
...
Continue to return null instead.
2013-11-19 23:36:44 +00:00
9ba5a7e190
Normalize viewer version string to accomodate new style version reporting in the viewers
2013-11-19 23:29:10 +00:00
f94d07f2e2
Add regression test to check that specifying a non-existent event raise a syntax error
...
This was the case before any of the recent changes
2013-11-16 03:02:57 +00:00
79c1ed8cb9
Add syntax checking for no_sensor() no-arg event
2013-11-16 03:00:03 +00:00
ec4d96acc9
refactor common code out of no argument LSL event regression tests
2013-11-16 02:58:06 +00:00
edd7e19463
If anything other than a single integer is specified for events that only 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
2013-11-16 02:50:14 +00:00
62006baaef
Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target 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
2013-11-16 01:30:23 +00:00
d728c1beb2
refactor LSL_EventTests.TestStateEntryEvent into single method to test compile
2013-11-16 01:25:25 +00:00
b58a474105
Ignore *.suo and *.user as these are user specific preference files from Visual Studio
...
http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
2013-11-16 00:21:12 +00:00
92fbe675b5
minor: Add OpenSim.v11.suo to .gitignore file.
...
This is generated if a vs2010 OpenSim.sln is loaded into vs2012
As per http://opensimulator.org/mantis/view.php?id=6839
2013-11-16 00:05:49 +00:00
ecfb78dd16
minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null
...
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
2013-11-15 23:16:12 +00:00
346644016c
If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase 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.
2013-11-15 23:10:59 +00:00
0595974a89
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-15 22:48:58 +00:00
f63fd81a68
update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope that it fixes some bulletsim issues on linux
2013-11-15 14:40:38 -08:00
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
b4932bda2a
If a local land ID is given to the "land show" command, then output to console the full details of that parcel.
...
Using "land show" without a land ID still outputs a summary of parcels in the region
2013-11-15 00:16:33 +00:00
8114ae0f8b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-13 23:27:25 +00:00
7da10850b0
Fix bug where removing a physical linkset would only decrement the Active 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.
2013-11-13 23:25:54 +00:00
869a23e223
Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.
...
Also fixes some issues in associated solution files
2013-11-13 01:07:14 +00:00
d71ebb7ec8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-13 00:27:05 +00:00
4563e7e04a
Get runprebuild.sh to generate a vs2010 for xbuild to work with .NET 4 rather than vs2008
...
At least since 2009, Monodevelop has been able to load vs2010 files as well
2013-11-13 00:25:41 +00:00
0f16612400
Fix runprebuild.bat on Windows 7 systems and later
...
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
2013-11-13 00:00:55 +00:00
fd24147afa
Add initial test for checking that specifying a parameter in LSL state_entry() generates a syntax error.
...
Same for other events to follow at a later date.
2013-11-09 00:36:05 +00:00
9a9abd37eb
minor: remove the bit left in the readme which said .net 3.5 framework was required
2013-11-08 23:16:09 +00:00
ea9e96dd50
Update OpenSimulator to use .NET 4.0
...
This allows region modules to register script functions that have more than a couple of arguments.
It also allows OpenSimulator code to use the feature and syntax additions that came with .NET 4.0
Windows users will need to install Microsoft .NET 4 framework if they have not done so already.
Windows C# Express 2010 also becomes the minimum IDE for build, so runprebuild.bat now generates a 2010 solution and runprebuild2010.bat goes away
Official minimum mono version becomes 2.10.8.1. OpenSimulator will probably work with 2.8 later but this is not guaranteed.
2013-11-08 21:13:05 +00:00
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
626a050159
minor: Make PID file example in Robust.HG.ini more meaningful as is now the case in OpenSim and vanilla ROBUST config files
2013-11-08 00:34:35 +00:00
5cef8bf64e
Make admin_save_oar request submit a request ID and log this for tracking.
...
Previous behaviour of always logging 'name' is unhelpful since this actually an error message parameter which is only filled out if an error has occurred
2013-11-08 00:31:26 +00:00
3b2721c957
update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29
...
- addresses particle flags issue
2013-11-06 19:13:41 -08:00
Melanie