aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into varregionRobert Adams2013-11-1534-100/+171
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-153-0/+0
| |\
| | * update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope that it ↵dahlia2013-11-153-0/+0
| | | | | | | | | | | | fixes some bulletsim issues on linux
| * | refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-1530-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-151-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 varregionRobert Adams2013-11-139-142/+285
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-135-126/+202
| |\
| | * Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.justincc2013-11-135-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-132-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/opensimJustin Clark-Casey (justincc)2013-11-131-3/+9
| |\
| | * Fix runprebuild.bat on Windows 7 systems and laterjustincc2013-11-131-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-131-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 RegionInfoRobert Adams2013-11-101-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 squareRobert Adams2013-11-103-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 varregionRobert Adams2013-11-0811-114/+206
|\ \ | |/
| * Add initial test for checking that specifying a parameter in LSL ↵Justin Clark-Casey (justincc)2013-11-091-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-081-2/+0
| | | | | | | | required
| * Update OpenSimulator to use .NET 4.0Justin Clark-Casey (justincc)2013-11-084-105/+125
| | | | | | | | | | | | | | | | 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.
| * minor: Make PID file example in Robust.HG.ini more meaningful as is now the ↵Justin Clark-Casey (justincc)2013-11-081-1/+1
| | | | | | | | case in OpenSim and vanilla ROBUST config files
| * Make admin_save_oar request submit a request ID and log this for tracking.Justin Clark-Casey (justincc)2013-11-081-4/+14
| | | | | | | | 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
| * update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29dahlia2013-11-061-0/+0
| | | | | | | | - addresses particle flags issue
| * minor: Make PID file examples in OpenSim and Robust config somewhat more ↵Justin Clark-Casey (justincc)2013-11-063-3/+3
| | | | | | | | meaningful than just /tmp/my.pid
* | varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-0824-90/+156
| | | | | | | | | | | | | | 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.
* | varregion: Massive work to LandManagementModule and LandObject toRobert Adams2013-11-082-183/+295
| | | | | | | | | | | | 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.
* | Merge branch 'master' into varregionRobert Adams2013-11-064-791/+817
|\ \ | |/
| * add support for particle glow LSL functionsdahlia2013-11-051-0/+12
| |
| * add support for particle blending LSL functionsdahlia2013-11-051-1/+15
| |
| * Update libomv to 7e260ad419ebb1c24a5f1b123e11dd930e05f414. Thanks lkalif :)dahlia2013-11-052-789/+789
| |
| * trigger a build to see if tests will workdahlia2013-11-051-1/+1
| |
* | Merge branch 'master' into varregionRobert Adams2013-11-0510-60/+168
|\ \ | |/
| * Added sending (for now hard-coded) sim isze in SendMapBlockSplit()Latif Khalifa2013-11-061-0/+6
| |
| * Updated libomv to 25ee208a 2013-11-05Latif Khalifa2013-11-066-53/+124
| |
| * Add IncomingPacketsResentCount clientstack statisticsJustin Clark-Casey (justincc)2013-11-061-0/+23
| | | | | | | | | | 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.
| * Record individual region bot disconnects in pCampbot logJustin Clark-Casey (justincc)2013-11-051-5/+12
| |
| * minor: comment out "SetLastPosition" GridUserService debug message for now.Justin Clark-Casey (justincc)2013-11-051-1/+2
| |
| * Fix a race condition where pCampbot actions could continue even if a bot had ↵Justin Clark-Casey (justincc)2013-11-051-1/+1
| | | | | | | | disconnected.
* | varregion: properly sense size of terrain heightmap and store asRobert Adams2013-11-051-4/+15
| | | | | | | | compressed 2D database blob if a varregion.
* | Merge branch 'master' into varregionRobert Adams2013-11-0423-7561/+7851
|\ \ | |/
| * If the LSL state_entry() event definition contains any parameters, then ↵Justin Clark-Casey (justincc)2013-11-024-7471/+7692
| | | | | | | | | | | | | | | | 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.
| * add null check for jpeg2000 sculpt image decode failure. Note: the ↵dahlia2013-11-011-0/+9
| | | | | | | | j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-11-011-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-011-1/+5
| | |\
| | * | For individual bots, seed random number generator with a random number from ↵Justin Clark-Casey (justincc)2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | discard alpha in 4-plane sculpt textures before generating physics proxy meshdahlia2013-11-011-12/+7
| | |/ | |/|
| * | add new particle system blending rule enumerationsdahlia2013-10-311-1/+5
| |/
| * minor: change "bot" pCampBot help cateogry to "Bots"Justin Clark-Casey (justincc)2013-11-011-12/+12
| |
| * Start counting resent packets in the places that I missed when the stat was ↵Justin Clark-Casey (justincc)2013-10-312-0/+8
| | | | | | | | first added a few commits ago
| * minor: remove mono compiler warnings in AvatarPickerSearchModule and ↵Justin Clark-Casey (justincc)2013-10-312-7/+3
| | | | | | | | UploadBakedTextureModule
| * Add OutgoingPacketsResentCount clientstack stat.Justin Clark-Casey (justincc)2013-10-312-1/+32
| | | | | | | | | | | | 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.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-311-0/+13
| |\