aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-0217-546/+145
|\
| * Reduce accessibility of some J2KImage/LLImageManager properties and methods t...Justin Clark-Casey (justincc)2012-01-022-12/+12
| * Adding commented out log messages and some minor formatting for future bug hu...Justin Clark-Casey (justincc)2012-01-024-1/+14
| * Fix for failed http request statusBlueWall2012-01-011-14/+17
| * 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-297-36/+80
| * Deleted two obsolete files in Inventory modules.Diva Canto2011-12-292-460/+0
| * Deleted unused methods from HGAssetBrokerDiva Canto2011-12-291-18/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-292-5/+13
| |\
| * | HG: more adjustments for making HG Simian work. Added server_uri as new key o...Diva Canto2011-12-291-2/+3
* | | Merge branch 'master' into careminsterMelanie2011-12-282-4/+13
|\ \ \ | | |/ | |/|
| * | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-282-5/+13
| |/
| * HG: more / love for XmasDiva Canto2011-12-241-2/+5
| * HG: one more adjustment with trailing /sDiva Canto2011-12-231-2/+8
* | Fix permissions being lost and correct slam behavior, removing icompatibleMelanie2011-12-271-86/+72
* | Remove a debug spamMelanie2011-12-271-1/+0
* | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-242-5/+13
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-241-10/+0
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-241-10/+0
| |\ \ | | |/
| | * remove the old region crossing handlerMic Bowman2011-12-231-10/+0
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-243-3/+27
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2011-12-233-3/+27
| |\ \ | | |/
| | * Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
| | * fix the UsesPhysics flag to reference the physics flag rather than the tempon...Mic Bowman2011-12-221-1/+1
| | * Align default ODE_STEPSIZE with that already used through OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-12-221-2/+2
* | | Add setter for Acceleration on physics objects.Melanie2011-12-242-0/+2
* | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
* | | Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.Melanie2011-12-241-0/+9
|/ /
* | 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-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are passing...Diva Canto2011-12-221-39/+32
* | 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-2212-152/+126
|\ \ | |/
| * 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-2112-39/+15
| |\
| | * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-2011-35/+14
| * | Moved an external test into the method that uses those preconditions.Diva Canto2011-12-211-19/+11
* | | Merge branch 'master' into careminsterMelanie2011-12-202-7/+7
|\ \ \ | | |/ | |/|
| * | 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-2016-272/+275
| |\
| * | Fixed bug of avie going under the terrain when crossing regions in certain di...Diva Canto2011-12-201-2/+2
| * | Changed the async approach on close child agents. This may improve crossings ...Diva Canto2011-12-162-7/+7
* | | Merge branch 'master' into careminsterMelanie2011-12-193-36/+44
|\ \ \ | | |/ | |/|