aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into varregionRobert Adams2014-01-043-8623/+10025
|\ | | | | | | | | | | | | | | | | 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.
| * Initialize default region size in GridRegion in the no parameter constructorRobert Adams2013-12-281-0/+2
| | | | | | | | as is used by the grid connector tests.
| * Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵Robert Adams2013-12-284-39/+195
| | | | | | | | | | | | | | | | | | and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size.
| * 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-0310-40/+107
| | | | | | | | | | | | | | | | | | | | | 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-2632-239/+224
| | | | | | | | | | | | 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-247-11/+17
| | |
* | | 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-203-7/+67
|\ \ \ | |/ /
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-193-7/+67
| |\ \ | | |/
| | * Add missing viewer param elements for butt and breast physics.Justin Clark-Casey (justincc)2013-12-191-1/+75
| | | | | | | | | | | | | | | Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces Thanks cinderblocks!
| | * Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵Justin Clark-Casey (justincc)2013-12-183-7/+67
| | | | | | | | | | | | sending
* | | Merge branch 'master' into varregionRobert Adams2013-12-1750-1244/+2740
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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-162-2/+6
| | |
| * | Populate user preferences with UserAccount email if it is present, else ↵BlueWall2013-12-163-7/+73
| | | | | | | | | | | | return an error indicating no email is on record for the user.
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-1611-84/+97
| |\ \
| | * \ 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-141-15/+15
| | |\ \ | | | |/
| | | * ParseNotecardToList() returned data past end of notecard text (mantis #6881).Kevin Cozens2013-12-141-15/+15
| | | |
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-144-23/+24
| | |\ \ | | | |/
| | | * 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-142-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()
| * | | This is the acutal sitting avatar crossing code. This commit implements theMelanie2013-12-161-2/+152
| |/ / | | | | | | | | | | | | | | | | | | | | | actual crossing mechanics for seated avatars, using the supporting code from the previous commits. Physics is not supported yet, although some few bits for them are already in place due to the earlier code drops. With this commit, crossing sitting avatar by "editing" the prim across the border, by using llSetPos or keyframe motion may already be possible. Vehicles will come next.
| * | Replace proprietary file header with BSD oneMelanie2013-12-111-6/+27
| | |
| * | Add missing files *blush*Melanie2013-12-112-0/+176
| | |
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-1119-593/+1595
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-111-2/+88
| |\ \ | | |/
| | * Add console utility commands "scale scene" and "translate scene". Note that ↵dahlia2013-12-101-2/+88
| | | | | | | | | | | | repeated use of these commands will induce floating point accumulation errors. Please back up your region before using.
| * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-112-239/+214
| |/ | | | | | | | | but I don't know if it runs. Will probably crash and burn as the supporting code isn't there yet.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-12-061-3/+0
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-12-0617-59/+314
| | |\
| | * | Fixed misleading commentDiva Canto2013-12-061-3/+0
| | | |
| * | | apparently mono DeflateStream has no CopyTo method =(dahlia2013-12-061-1/+5
| | |/ | |/|
generated by cgit v1.1 at 2024-12-21 14:08:04 +0000