aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)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 fix...dahlia2013-11-153-0/+0
| * | refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-1530-47/+46
| |/
| * If a local land ID is given to the "land show" command, then output to consol...Justin Clark-Casey (justincc)2013-11-151-54/+126
* | 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
| * | Fix bug where removing a physical linkset would only decrement the Active Obj...Justin Clark-Casey (justincc)2013-11-132-2/+73
| |/
| * 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
| * | Get runprebuild.sh to generate a vs2010 for xbuild to work with .NET 4 rather...Justin Clark-Casey (justincc)2013-11-131-11/+1
| |/
* | varregion: extend TerrainModule to use the region size from RegionInfoRobert Adams2013-11-101-14/+14
* | varregion: fix GetLandObject error return and initialization of squareRobert Adams2013-11-103-12/+37
* | Merge branch 'master' into varregionRobert Adams2013-11-0811-114/+206
|\ \ | |/
| * Add initial test for checking that specifying a parameter in LSL state_entry(...Justin Clark-Casey (justincc)2013-11-091-0/+64
| * minor: remove the bit left in the readme which said .net 3.5 framework was re...Justin Clark-Casey (justincc)2013-11-081-2/+0
| * Update OpenSimulator to use .NET 4.0Justin Clark-Casey (justincc)2013-11-084-105/+125
| * minor: Make PID file example in Robust.HG.ini more meaningful as is now the c...Justin Clark-Casey (justincc)2013-11-081-1/+1
| * Make admin_save_oar request submit a request ID and log this for tracking.Justin Clark-Casey (justincc)2013-11-081-4/+14
| * update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29dahlia2013-11-061-0/+0
| * minor: Make PID file examples in OpenSim and Robust config somewhat more mean...Justin Clark-Casey (justincc)2013-11-063-3/+3
* | varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-0824-90/+156
* | varregion: Massive work to LandManagementModule and LandObject toRobert Adams2013-11-082-183/+295
* | 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
| * 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
* | varregion: properly sense size of terrain heightmap and store asRobert Adams2013-11-051-4/+15
* | Merge branch 'master' into varregionRobert Adams2013-11-0423-7561/+7851
|\ \ | |/
| * If the LSL state_entry() event definition contains any parameters, then gener...Justin Clark-Casey (justincc)2013-11-024-7471/+7692
| * add null check for jpeg2000 sculpt image decode failure. Note: the j2kDecodeC...dahlia2013-11-011-0/+9
| * 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 B...Justin Clark-Casey (justincc)2013-11-011-1/+1
| * | | 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 f...Justin Clark-Casey (justincc)2013-10-312-0/+8
| * minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBa...Justin Clark-Casey (justincc)2013-10-312-7/+3
| * Add OutgoingPacketsResentCount clientstack stat.Justin Clark-Casey (justincc)2013-10-312-1/+32
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-311-0/+13
| |\