Commit Graph

25119 Commits (42a58101cf21a52d6a0cdb9068c102fac6fe6e63)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) d728c1beb2 refactor LSL_EventTests.TestStateEntryEvent into single method to test compile 2013-11-16 01:25:25 +00:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 0595974a89 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-11-15 22:48:58 +00:00
dahlia f63fd81a68 update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope that it fixes some bulletsim issues on linux 2013-11-15 14:40:38 -08:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 8114ae0f8b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-11-13 23:27:25 +00:00
Justin Clark-Casey (justincc) 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
justincc 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
Justin Clark-Casey (justincc) d71ebb7ec8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-11-13 00:27:05 +00:00
Justin Clark-Casey (justincc) 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
justincc 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Melanie 91b70bf3fe Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
dahlia 3b2721c957 update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29
- addresses particle flags issue
2013-11-06 19:13:41 -08:00
Justin Clark-Casey (justincc) 52ff860f30 minor: Make PID file examples in OpenSim and Robust config somewhat more meaningful than just /tmp/my.pid 2013-11-06 23:27:19 +00:00
dahlia 0b4577d5b0 add support for particle glow LSL functions 2013-11-05 23:48:44 -08:00
dahlia 709814c194 add support for particle blending LSL functions 2013-11-05 23:38:43 -08:00
dahlia e1ce3907f2 Update libomv to 7e260ad419ebb1c24a5f1b123e11dd930e05f414. Thanks lkalif :) 2013-11-05 23:01:14 -08:00
dahlia cd33972ed1 trigger a build to see if tests will work 2013-11-05 22:04:39 -08:00
Latif Khalifa 26fd29622d Added sending (for now hard-coded) sim isze in SendMapBlockSplit() 2013-11-06 03:52:04 +01:00
Latif Khalifa 417836ac5e Updated libomv to 25ee208a 2013-11-05 2013-11-06 02:43:44 +01:00
Justin Clark-Casey (justincc) 8e1bf55e7b Add IncomingPacketsResentCount clientstack statistics
This records how many packets were indicated to be resends by clients
Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
2013-11-06 01:02:20 +00:00
Justin Clark-Casey (justincc) caf2abe311 Record individual region bot disconnects in pCampbot log 2013-11-05 23:32:26 +00:00
Justin Clark-Casey (justincc) fb23f78928 minor: comment out "SetLastPosition" GridUserService debug message for now. 2013-11-05 23:18:09 +00:00
Justin Clark-Casey (justincc) 2d315ec207 Fix a race condition where pCampbot actions could continue even if a bot had disconnected. 2013-11-05 20:58:52 +00:00
Melanie ba203ed94f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
Justin Clark-Casey (justincc) 2b069a3b1e If the LSL state_entry() event definition contains any parameters, then generate syntax error as seen on the LL grid
This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event.
We were already enforcing event names in the parser.
This is only for state_entry so far as an initial test of the approach - appears to work correctly.
2013-11-02 00:39:12 +00:00
dahlia 7faf286d00 add null check for jpeg2000 sculpt image decode failure. Note: the j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed. 2013-11-01 13:45:09 -07:00
dahlia ce94f990bb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-11-01 01:42:43 -07:00
dahlia f4ded3af63 discard alpha in 4-plane sculpt textures before generating physics proxy mesh 2013-11-01 01:40:56 -07:00
Justin Clark-Casey (justincc) db32e5d304 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-11-01 02:05:12 +00:00
Justin Clark-Casey (justincc) c6395240f0 For individual bots, seed random number generator with a random number from BotManager rather than Environment.Tickcount
Otherwise, since bots are now created all at once, a bunch will get exactly the same tickcount and hence number sequences
2013-11-01 02:04:04 +00:00
dahlia cc73ef4eb9 add new particle system blending rule enumerations 2013-10-31 17:49:01 -07:00
Justin Clark-Casey (justincc) cc7065f9ee minor: change "bot" pCampBot help cateogry to "Bots" 2013-11-01 00:04:18 +00:00
Justin Clark-Casey (justincc) 4c4a1cf715 Start counting resent packets in the places that I missed when the stat was first added a few commits ago 2013-10-31 23:59:22 +00:00
Justin Clark-Casey (justincc) 50794c9008 minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule 2013-10-31 23:51:01 +00:00
Justin Clark-Casey (justincc) 3d5a7e9b19 Add OutgoingPacketsResentCount clientstack stat.
This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
2013-10-31 23:45:52 +00:00
Justin Clark-Casey (justincc) b7c57294cc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-10-31 23:45:19 +00:00
dahlia eb52d346c0 add new LSL constants associated with new "ribbon", "glow", and "blend" particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system 2013-10-31 16:13:03 -07:00
Justin Clark-Casey (justincc) 0e07fad2e1 minor: update pCampbot usage/help statement 2013-10-31 20:19:57 +00:00
dahlia 46a4c32e27 update libomv to 5b4c1e8694479629f7cacd72dd6bc39a6b327f9c (git master as of time of this commit) 2013-10-30 22:01:34 -07:00