aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-062-2/+22
|\
| * Improve "j2k decode" command to tell us how many layers and components were d...Justin Clark-Casey (justincc)2012-01-051-0/+10
| * Add a "j2k decode" region console command that allows a manual request for a ...Justin Clark-Casey (justincc)2012-01-051-1/+8
| * Improve "app rebake" command to return a better message if no uploaded textur...Justin Clark-Casey (justincc)2012-01-051-1/+4
* | 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
| |\ \ | | |/
| | * 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
| | | * 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 problema...Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | * | Access to these static methods to serialize objects are useful outside of ser...Dan Lake2012-01-031-4/+4
| | * | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| | | |/ | | |/|
| | * | Profile UpdatesBlueWall2012-01-031-0/+3
* | | | 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
|\ \ \ | |/ /
| * | Bug fix in map tiles in standalone: the map has been blank since commit 01ae9...Diva Canto2011-12-301-13/+20
| * | Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region...Diva Canto2011-12-291-0/+2
* | | 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 tempon...Mic Bowman2011-12-221-1/+1
* | | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
|/ / /
* | | Merge branch 'master' into careminsterMelanie2011-12-224-8/+18
|\ \ \ | |/ /
| * | rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte...Justin Clark-Casey (justincc)2011-12-222-3/+3
| * | 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 boo...Justin Clark-Casey (justincc)2011-12-222-1/+13
* | | 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
|\ \ \ | |/ /
| * | Fixing a bug introduced yesterday. This put the precondition test inside Chec...Diva Canto2011-12-221-105/+109
| * | 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
|\ \ \ | | |/ | |/|
| * | Though the viewer warns about receiving this, not sending appears to break ba...Justin Clark-Casey (justincc)2011-12-201-4/+1
| |/
| * 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
* | | Merge branch 'master' into careminsterMelanie2011-12-192-6/+44
|\ \ \ | | |/ | |/|
| * | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a...Justin Clark-Casey (justincc)2011-12-192-6/+44
* | | 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
| * | Migrate detailed "appearance show" report generation up to AvatarFactoryModul...Justin Clark-Casey (justincc)2011-12-192-2/+11
* | | 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 c...Justin Clark-Casey (justincc)2011-12-174-17/+8
| * | refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim...Justin Clark-Casey (justincc)2011-12-172-142/+81
| * | Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-163-27/+10
generated by cgit v1.1 at 2024-12-20 19:24:36 +0000