aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into varregionRobert Adams2014-01-1110-160/+206
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneBase.cs OpenSim/Services/Interfaces/IGridService.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs (conflicts were debug statements that are commented out in master branch)
| * | Fix crash in BulletSim which sometimes happens making a linkset physicalRobert Adams2014-01-101-7/+32
| | | | | | | | | | | | | | | | | | (like sitting on and activating a vehicle) and crossing borders. This keeps better bookkeeping on compound shapes so BulletSim can identify them when being freed.
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-1/+1
| |\ \ | | |/
| | * Fixed llTextBox error message textDavid Rowe2014-01-101-1/+1
| | |
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-5/+5
| |\ \ | | |/
| | * Dynamically adjust to the number of visual params sent.Melanie2014-01-101-1/+1
| | |
| | * When moving the root prim of an attachment: a) Change the attach position; ↵Oren Hurvitz2014-01-101-5/+5
| | | | | | | | | | | | b) Move the other prims in the reverse direction to compensate
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-106-138/+148
| |\ \ | | |/
| | * When creating a coalesced object, set its permissions to the ↵Oren Hurvitz2014-01-101-7/+16
| | | | | | | | | | | | lowest-common-denominator of all the sub-objects
| | * When creating a coalesced object, set its Creator ID if all the objects have ↵Oren Hurvitz2014-01-101-4/+15
| | | | | | | | | | | | the same creator
| | * Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-104-32/+24
| | | | | | | | | | | | its main permissions
| | * Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-104-94/+92
| | | | | | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-082-8/+19
| |\ \ | | |/
| | * If an agent is sitting, then do send the rotation in the agent update ↵Justin Clark-Casey (justincc)2014-01-082-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | instead of zeroing it to resolve mouselook camera problems Addresses http://opensimulator.org/mantis/view.php?id=6892 Thanks to tglion for this spot. This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7
| * | Some missing definitions needed for successful compilation.Robert Adams2014-01-042-2/+4
| | |
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-045-34/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| * | Dynamically adjust to the number of visual params sent.Melanie2014-01-041-1/+1
| | |
* | | Merge branch 'master' into varregionRobert Adams2014-01-042-8623/+10023
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Constants.cs OpenSim/Framework/RegionInfo.cs OpenSim/Services/GridService/GridService.cs OpenSim/Services/Interfaces/IGridService.cs Most conflicts had to do with Util routines not in master branch yet.
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-212-8623/+10023
| |\ \ | | |/
| | * Add lsl arg syntax checking for control eventJustin Clark-Casey (justincc)2013-12-212-9386/+9716
| | |
| | * refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for ↵Justin Clark-Casey (justincc)2013-12-211-7907/+7903
| | | | | | | | | | | | consistency
| | * Add arg checking for at_target lsl eventJustin Clark-Casey (justincc)2013-12-212-8828/+9158
| | |
| | * Add lsl event arg checking for at_rot_targetJustin Clark-Casey (justincc)2013-12-212-8915/+9306
| | |
| | * Add lsl event argument checking for attach and on_rezJustin Clark-Casey (justincc)2013-12-212-8593/+8946
| | |
* | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-035-34/+76
| | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen).
* | | varregion: extract banned region logic into a class for cleanlyness.Robert Adams2013-12-272-148/+187
| | | | | | | | | | | | | | | Add 'not found' caching in EntityTransferModule.GetRegionContainingWorldLocation so hitting borders and bad teleports do not continuiously hammer on the GridService.
* | | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-2625-179/+149
| | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | varregion: add lots of DEBUG level log messages. Especially for teleport.Robert Adams2013-12-246-10/+16
| | |
* | | varregion: remove unused Scene.HaveNeighbor routine. Its computationRobert Adams2013-12-241-42/+1
| | | | | | | | | | | | was wrong for large regions anyway.
* | | varregion: fix bug where destination region is not found and object isRobert Adams2013-12-241-47/+61
| | | | | | | | | | | | not restored to its original location.
* | | Merge branch 'master' into varregionRobert Adams2013-12-202-6/+65
|\ \ \ | |/ /
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-192-6/+65
| |\ \ | | |/
| | * Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵Justin Clark-Casey (justincc)2013-12-182-6/+65
| | | | | | | | | | | | sending
* | | Merge branch 'master' into varregionRobert Adams2013-12-1727-1082/+2019
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fix issue with editing notes for other avatarsBlueWall2013-12-161-2/+2
| | |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-169-67/+80
| |\ \
| | * \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-1/+1
| | |\ \ | | | |/
| | | * Extend TestLlGetNotecardLine() regression test to contain chars that are two ↵Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | | | | | | | | | | | | | | bytes in utf8
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-143-21/+22
| | |\ \ | | | |/
| | | * Wrap analysis of the particle system in the UUID Gatherer in a separate ↵Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion.
| | | * After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵Justin Clark-Casey (justincc)2013-12-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
| | | * Convert if-blocks to return statements in small functions such as ↵Eva Comaroski2013-12-141-15/+5
| | | | | | | | | | | | | | | | GetStartParameter().
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-16/+22
| | |\ \ | | | |/
| | | * Make WindParamSet success a console message rather than a log message.Justin Clark-Casey (justincc)2013-12-141-2/+1
| | | | | | | | | | | | | | | | This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
| | | * minor: Make wind console commands print out to console rather than logJustin Clark-Casey (justincc)2013-12-141-14/+21
| | | |
| | * | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and ↵Justin Clark-Casey (justincc)2013-12-142-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | NPC tests until positions are known to be stable. Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
| | * | Fix build break in test from previous commit 54cc229 - hadn't realized ↵Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | | | | | | | | | | | | | | ScenePresence inst var name was slightly different
| | * | Fix TestSitAndStandWithNoSitTarget NPC and SP tests.Justin Clark-Casey (justincc)2013-12-143-15/+4
| | | | | | | | | | | | | | | | | | | | These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
| | * | Eliminate unnecessary line from my previous commit 1d605642Justin Clark-Casey (justincc)2013-12-131-2/+0
| | | |
| | * | Refix sitting on child prims by reinserting relevant code back into ↵Justin Clark-Casey (justincc)2013-12-111-3/+22
| | | | | | | | | | | | | | | | SP.HandleAgentSit()