aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-062-2/+22
|\ | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "j2k decode" command to tell us how many layers and components were ↵Justin Clark-Casey (justincc)2012-01-051-0/+10
| | | | | | | | decoded, instead of just success/failure
| * Add a "j2k decode" region console command that allows a manual request for a ↵Justin Clark-Casey (justincc)2012-01-051-1/+8
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-1/+4
| | | | | | | | texture ids were available for the rebake request
* | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-056-5/+55
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-057-12/+58
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-055-5/+52
| | |\
| | | * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-041-0/+22
| | | | | | | | | | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
| | | * Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| | | |
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-036-177/+214
| | | |\
| | | | * commented out "Prevented flyoff" log message for now as this becomes ↵Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed.
| | | * | Access to these static methods to serialize objects are useful outside of ↵Dan Lake2012-01-031-4/+4
| | | | | | | | | | | | | | | | | | | | serializer
| | * | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| | | |/ | | |/|
| | * | Profile UpdatesBlueWall2012-01-031-0/+3
| | | | | | | | | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | | | Clean up GetWorldPositionMelanie2012-01-051-7/+3
| | | |
* | | | Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|/ / /
* | | Merge branch 'master' into careminsterMelanie2012-01-022-13/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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 Canto2011-12-301-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.
| * | Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵Diva Canto2011-12-291-0/+2
| | | | | | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-241-1/+1
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2011-12-231-1/+1
| |\ \ \ | | |/ /
| | * | fix the UsesPhysics flag to reference the physics flag rather than the ↵Mic Bowman2011-12-221-1/+1
| | | | | | | | | | | | | | | | temponrez flag
* | | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
|/ / / | | | | | | | | | Now SL compatible.
* | | Merge branch 'master' into careminsterMelanie2011-12-224-8/+18
|\ \ \ | |/ /
| * | rename Scene.m_physicalPrim to PhysicalPrims since its public and access ↵Justin Clark-Casey (justincc)2011-12-222-3/+3
| | | | | | | | | | | | external as a property
| * | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| | |
| * | Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-222-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 careminsterMelanie2011-12-221-1/+1
|\ \ \ | |/ /
| * | And a typo fixMelanie2011-12-221-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-221-1/+6
|\ \ \ | |/ /
| * | Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
| | |
| * | Harmonizing SP with AvinationMelanie2011-12-221-41/+55
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-221-117/+112
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fixing a bug introduced yesterday. This put the precondition test inside ↵Diva Canto2011-12-221-105/+109
| | | | | | | | | | | | CheckForBorderCrossing the right way.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-211-4/+1
| |\ \ | | |/
| * | Moved an external test into the method that uses those preconditions.Diva Canto2011-12-211-19/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-201-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-201-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/opensimDiva Canto2011-12-208-194/+163
| |\
| * | Changed the async approach on close child agents. This may improve crossings ↵Diva Canto2011-12-162-7/+7
| | | | | | | | | | | | a little bit.
* | | Merge branch 'master' into careminsterMelanie2011-12-192-6/+44
|\ \ \ | | |/ | |/|
| * | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs ↵Justin Clark-Casey (justincc)2011-12-192-6/+44
| | | | | | | | | | | | as this is updating SOG/SOP.GroupID, which is arguably generic.
* | | Merge branch 'master' into careminsterMelanie2011-12-192-3/+15
|\ \ \ | |/ /
| * | Stop sending the viewer its own AvatarAppearance packet.Justin Clark-Casey (justincc)2011-12-191-1/+4
| | | | | | | | | | | | | | | The viewer warns in the log if it receives this. Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
| * | Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-192-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | | Merge branch 'master' into careminsterMelanie2011-12-187-234/+154
|\ \ \ | |/ /
| * | Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-174-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
| * | refactor: simplify methods in Scene.PacketHandlers.cs by using ↵Justin Clark-Casey (justincc)2011-12-172-142/+81
| | | | | | | | | | | | GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
| * | Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-163-27/+10
| | | | | | | | | | | | These were entirely unused.
generated by cgit v1.1 at 2024-12-30 04:59:59 +0000