aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-2348-8478/+9551
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Revert "Fix issue where sitting on non-root linked prims would send camera ↵Justin Clark-Casey (justincc)2013-11-232-14/+3
| | | | | | | | | | | | | | | | to wrong position in third-person and mouselook" Reverting to place on separate branch This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
| * Revert "Add line accidentally left out of recent non-root prim sit fix"Justin Clark-Casey (justincc)2013-11-231-2/+0
| | | | | | | | | | | | Reverting to place on new branch This reverts commit ed1029712a85206430fee1d4897d473517728dab.
| * Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset ↵Justin Clark-Casey (justincc)2013-11-231-2/+5
| | | | | | | | | | | | is Vector3.Zero" This reverts commit 9bdd3dc7de46507b490a2eae5160123a28133d63.
| * Revert "Fix non-root prim sit positions for prims where a sit target has ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | been specified as well." Revert to place on separate branch for now This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.
| * Revert "Refix fix for sitting on non-root linked prims with explicit sit ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | targets." This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb.
| * Revert "fix avatar rotation when sitting on a linked part"Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | Reverting for now to place on separate branch This reverts commit 65304260af283211443a2872c46f6609d3e45649.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-231-4/+5
| |\
| | * Fixed the update StoreRegionWindlightSettings() wasn't updating ↵Fernando Oliveira2013-11-221-4/+5
| | | | | | | | | | | | | | | | | | | | | regionwindlight table, raising PrimaryKey violation; Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br> Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * | fix avatar rotation when sitting on a linked partJustin Clark-Casey (justincc)2013-11-231-1/+1
| |/ | | | | | | Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
| * Refix fix for sitting on non-root linked prims with explicit sit targets.Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
| * Fix non-root prim sit positions for prims where a sit target has been ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | specified as well.
| * Add line accidentally left out of recent non-root prim sit fixJustin Clark-Casey (justincc)2013-11-231-0/+2
| | | | | | | | Original commit is ff4e7de7
| * Still send CameraEyeOffset in UDP SendSitReponse even if at offset is ↵Justin Clark-Casey (justincc)2013-11-231-5/+2
| | | | | | | | | | | | 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.
| * Fix false positive test failure in ↵Justin Clark-Casey (justincc)2013-11-231-2/+2
| | | | | | | | | | | | TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up. Use 0.0.0.0 instead of localhost
| * Fix issue where sitting on non-root linked prims would send camera to wrong ↵Justin Clark-Casey (justincc)2013-11-232-3/+14
| | | | | | | | | | | | position in third-person and mouselook We now specify sits as offsets from the root prim, as the viewer expects.
| * Added admin_authenticate_user commandEva Comaroski2013-11-201-0/+136
| |
| * Fix bug where "show modules" would accidentally list all the shared modules ↵Justin Clark-Casey (justincc)2013-11-191-1/+1
| | | | | | | | | | | | again as "non-shared" Addresses http://opensimulator.org/mantis/view.php?id=6860
| * rename private field ACD.ViewerInternal to m_viewerInternal in line with ↵Justin Clark-Casey (justincc)2013-11-191-5/+6
| | | | | | | | conventions used elsewhere in code
| * Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has ↵Justin Clark-Casey (justincc)2013-11-191-1/+1
| | | | | | | | | | | | been set. Continue to return null instead.
| * Normalize viewer version string to accomodate new style version reporting in ↵Latif Khalifa2013-11-191-1/+24
| | | | | | | | the viewers
| * Add regression test to check that specifying a non-existent event raise a ↵Justin Clark-Casey (justincc)2013-11-161-0/+9
| | | | | | | | | | | | syntax error This was the case before any of the recent changes
| * Add syntax checking for no_sensor() no-arg eventJustin Clark-Casey (justincc)2013-11-162-4970/+4981
| |
| * refactor common code out of no argument LSL event regression testsJustin Clark-Casey (justincc)2013-11-161-14/+13
| |
| * If anything other than a single integer is specified for events that only ↵Justin Clark-Casey (justincc)2013-11-162-8245/+8691
| | | | | | | | | | | | 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
| * Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target ↵Justin Clark-Casey (justincc)2013-11-162-7447/+7520
| | | | | | | | | | | | | | 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
| * refactor LSL_EventTests.TestStateEntryEvent into single method to test compileJustin Clark-Casey (justincc)2013-11-161-14/+17
| |
| * minor: Use default(UUID) in rez attachment failure error logging rather than ↵Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | | | | | | | (UUID)null Patch from http://opensimulator.org/mantis/view.php?id=6843 Thanks Kira.
| * If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase ↵Justin Clark-Casey (justincc)2013-11-151-6/+13
| | | | | | | | | | | | | | 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.
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-1529-47/+45
| | | | | | | | 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' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-133-126/+202
| |\
| | * Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.justincc2013-11-133-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.
| * 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.
| * 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
| * add support for particle glow LSL functionsdahlia2013-11-051-0/+12
| |
| * add support for particle blending LSL functionsdahlia2013-11-051-1/+15
| |
| * Added sending (for now hard-coded) sim isze in SendMapBlockSplit()Latif Khalifa2013-11-061-0/+6
| |
| * 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.
* | Merge branch 'master' into careminsterMelanie2013-11-0825-7617/+7967
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * 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
| | |/ | |/|