| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | TP Routing debug | BlueWall | 2012-01-09 | 1 | -2/+5 | |
| | | | | | | | | | Fix test to checking against bitfield instead of int | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-09 | 1 | -1/+20 | |
| |\ \ | |/ | ||||||
| | * | Fix teleport routing for incoming HG+Owner | BlueWall | 2012-01-09 | 1 | -18/+19 | |
| | | | | | | | | | Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in. | |||||
| | * | Debugging HG teleport routing | BlueWall | 2012-01-09 | 1 | -0/+18 | |
| | | | | | | | | | Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-09 | 1 | -2/+4 | |
| |\ \ | |/ | ||||||
| | * | Fix HG teleport routing | BlueWall | 2012-01-09 | 1 | -2/+4 | |
| | | | | | | | | | Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types. | |||||
| | * | Fix a build break | Melanie | 2012-01-09 | 1 | -1/+1 | |
| | | | ||||||
| | * | Add the HG case to landing point checks | Melanie | 2012-01-09 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -16/+58 | |
| | | | ||||||
| | * | Fix teleport routing | BlueWall | 2012-01-08 | 1 | -0/+17 | |
| | | | | | | | | | Route non-owner avatars according to land settings | |||||
| * | | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -1/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-07 | 2 | -20/+22 | |
| |\ \ | |/ | ||||||
| | * | Add method doc to SPA.Falling and use automatic private get property | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -13/+14 | |
| | | | ||||||
| | * | Fix bug where tapping home to stop falling would stop any avatar movement ↵ | Justin Clark-Casey (justincc) | 2012-01-07 | 2 | -9/+10 | |
| | | | | | | | | | | | | | other than falling again. Addresses http://opensimulator.org/mantis/view.php?id=5839 | |||||
| | * | If dragging a script that is no copy from prim inventory into agent | Melanie | 2012-01-06 | 1 | -16/+39 | |
| | | | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof. | |||||
| * | | If dragging a script that is no copy from prim inventory into agent | Melanie | 2012-01-06 | 1 | -5/+24 | |
| | | | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof. | |||||
| * | | That needs to be callable from elsewhere! | Melanie | 2012-01-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-05 | 4 | -5/+30 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 5 | -12/+33 | |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-05 | 4 | -5/+30 | |
| | | |\ | ||||||
| | | | * | Added EventManager.OnRegionStarted which is triggered when Heartbeat is started. | Dan Lake | 2012-01-04 | 2 | -0/+25 | |
| | | | | | ||||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-01-03 | 5 | -177/+209 | |
| | | | |\ | ||||||
| | | | | * | commented out "Prevented flyoff" log message for now as this becomes ↵ | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed. | |||||
| | | | * | | Access to these static methods to serialize objects are useful outside of ↵ | Dan Lake | 2012-01-03 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | serializer | |||||
| | | * | | | Small fix to GetWorldPosition to get closer to Avination sit behavior | Melanie | 2012-01-05 | 1 | -10/+4 | |
| | | | |/ | | |/| | ||||||
| * | | | | Clean up GetWorldPosition | Melanie | 2012-01-05 | 1 | -7/+3 | |
| | | | | | ||||||
| * | | | | Prevent spurious "CHANGED_POSITION" during region backup | Melanie | 2012-01-05 | 1 | -3/+4 | |
| |/ / / | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -13/+20 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs | |||||
| | * | | Bug fix in map tiles in standalone: the map has been blank since commit ↵ | Diva Canto | 2011-12-30 | 1 | -13/+20 | |
| | | | | | | | | | | | | | | | | | | | 01ae916bad672722aa62ee712b7b580d6f5f4370 r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4901167779f07ed3e89fb1d24ffc22a Author: Oren Hurvitz Date: 7/22/2011 This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images. | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-24 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | fix the UsesPhysics flag to reference the physics flag rather than the ↵ | Mic Bowman | 2011-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | temponrez flag | |||||
| * | | | | Fix camera orientation for sit targets to use the prim actually sat on. | Melanie | 2011-12-24 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | Now SL compatible. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 4 | -8/+18 | |
| |\ \ \ | |/ / | ||||||
| | * | | rename Scene.m_physicalPrim to PhysicalPrims since its public and access ↵ | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -3/+3 | |
| | | | | | | | | | | | | | external as a property | |||||
| | * | | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -4/+2 | |
| | | | | ||||||
| | * | | Make it possible to force all prims to be phantom via the collidable_prim ↵ | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+1 | |
| |\ \ \ | |/ / | ||||||
| | * | | And a typo fix | Melanie | 2011-12-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+6 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add a few comments, correct a merge artefact | Melanie | 2011-12-22 | 1 | -1/+6 | |
| | | | | ||||||
| | * | | Harmonizing SP with Avination | Melanie | 2011-12-22 | 1 | -41/+55 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -117/+112 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | Fixing a bug introduced yesterday. This put the precondition test inside ↵ | Diva Canto | 2011-12-22 | 1 | -105/+109 | |
| | | | | | | | | | | | | | CheckForBorderCrossing the right way. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-21 | 1 | -4/+1 | |
| | |\ \ | | |/ | ||||||
| | * | | Moved an external test into the method that uses those preconditions. | Diva Canto | 2011-12-21 | 1 | -19/+11 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-20 | 1 | -5/+5 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | | Though the viewer warns about receiving this, not sending appears to break ↵ | Justin Clark-Casey (justincc) | 2011-12-20 | 1 | -4/+1 | |
| | |/ | | | | | | | | | | | | | | | | | | | baked texture caching when crossing region boundaries. Needs further investigation. Revert "Stop sending the viewer its own AvatarAppearance packet." This reverts commit 92039f295d7fe66bf1a09b29483f9057e395839e. | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-20 | 7 | -193/+153 | |
| | |\ | ||||||
| | * | | Changed the async approach on close child agents. This may improve crossings ↵ | Diva Canto | 2011-12-16 | 2 | -7/+7 | |
| | | | | | | | | | | | | | a little bit. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |