Commit Graph

20889 Commits (84d7227dfd8fc7e673b3015e2b5495d1752e16a3)

Author SHA1 Message Date
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
Robert Adams e2a1fa806d varregion: extend TerrainModule to use the region size from RegionInfo
rather than using Constants.RegionSize. This allows loading and saving
of terrain heightmaps that match the size of non-legacy sized regions.
2013-11-10 21:12:17 -08:00
Robert Adams c12e68e34d varregion: fix GetLandObject error return and initialization of square
land object bitmaps. This fixes creation of child presences and the
editing of parcels.
Also lots of commented out debugging messages.
2013-11-10 19:52:31 -08:00
Robert Adams 7061784cc6 Merge branch 'master' into varregion 2013-11-08 20:55:28 -08:00
Robert Adams beeec1c467 varregion: elimination of Constants.RegionSize from all over OpenSimulator.
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
2013-11-08 20:53:37 -08:00
Robert Adams a7a837550e varregion: Massive work to LandManagementModule and LandObject to
handle variable sized regions. Many changes for both the region and parcels.
Most of the constant "4" (for the 4x4 parcel units) have been replaced
with symbols and math.
2013-11-08 20:51:09 -08: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
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
Robert Adams f7bd0da026 Merge branch 'master' into varregion 2013-11-06 06:32:11 -08: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
Robert Adams a75ce7423c Merge branch 'master' into varregion 2013-11-05 21:42:27 -08:00
Robert Adams d0854e4ace varregion: properly sense size of terrain heightmap and store as
compressed 2D database blob if a varregion.
2013-11-05 21:33:02 -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
Robert Adams c931b16c1f Merge branch 'master' into varregion 2013-11-04 22:12:57 -08:00
Robert Adams f2810bf03a varregion: add plumbing to pass region size from Scene down to the
physics engine.
Older physics engines will default to the legacy region size.
Update BulletSim to use the new region size information.
2013-11-04 22:10:54 -08:00
Robert Adams cd1a23fc14 varregion: remove uses of region size constant. In particular, update scene
to check for border crossings based on the size of the region.
2013-11-04 22:09:52 -08:00
Robert Adams ac94dc8a14 varregion: remove unused terrain serialization code in SQLite and PGSQL modules 2013-11-04 22:06:20 -08:00
Robert Adams 9bf363e9be varregion: send the proper terrain patch layer code for large terrain.
Code cleanups.
2013-11-03 08:14:51 -08:00
Robert Adams 79b031bd0c varregion: send region size in LLLoginResponse. 2013-11-02 15:42:26 -07:00
Robert Adams 6df7d4219d varregion: add linkage for region size in creations and conversions
of GridRegion. New variables for size and code to initialize same.
2013-11-02 15:40:48 -07:00
Robert Adams f66737fe56 varregion: Enforce the configuration of square regions in RegionInfo.cs. 2013-11-02 15:36:16 -07: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
Robert Adams 92c06a5d0b varregion: fix lawn-mower terrain fill so it works for non-square regions.
Add some debugging logs on region creation to report region size.
2013-11-01 16:37:27 -07:00
Robert Adams 976530569a varregion: enforce multiple of 256 for region size when parameters fetched from user.
Output info and warning messages for non-legacy region sizes.
2013-11-01 16:06:19 -07: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
Robert Adams ff5885ab23 varregion: push TerrainData implementation up and down the database storage stack.
Implement both LoadTerrain and StoreTerrain for all DBs.
Move all database blob serialization/deserialization into TerrainData.
2013-11-01 11:35:31 -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