aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-069-22/+404
|\
| * Improve "j2k decode" command to tell us how many layers and components were d...Justin Clark-Casey (justincc)2012-01-053-8/+39
| * Add a "j2k decode" region console command that allows a manual request for a ...Justin Clark-Casey (justincc)2012-01-053-9/+163
| * Make "show asset" command available simulator side. Actually make the servic...Justin Clark-Casey (justincc)2012-01-051-0/+51
| * Move simulator asset info commands to an optional module from the connector. ...Justin Clark-Casey (justincc)2012-01-052-3/+136
| * recomment log messages I accidentally left uncommentedJustin Clark-Casey (justincc)2012-01-051-6/+6
| * Improve "app rebake" command to return a better message if no uploaded textur...Justin Clark-Casey (justincc)2012-01-054-12/+25
| * Commenting out DataSnapShot message "Registering service discovery capability...Justin Clark-Casey (justincc)2012-01-051-1/+1
* | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-0514-76/+328
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-0515-83/+331
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-0511-75/+225
| | |\
| | | * Add "appearance rebake" command to ask a specific viewer to rebake textures f...Justin Clark-Casey (justincc)2012-01-042-4/+51
| | | * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-042-31/+63
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-042-0/+25
| | | |\
| | | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-041-16/+4
| | | | |\
| | | | * | Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| | | * | | Minor formatting changes and commented out log lines for future debugging of ...Justin Clark-Casey (justincc)2012-01-044-22/+80
| | | | |/ | | | |/|
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-041-4/+4
| | | |\ \ | | | | |/
| | | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-0326-776/+513
| | | | |\
| | | | * | Access to these static methods to serialize objects are useful outside of ser...Dan Lake2012-01-031-4/+4
| | | * | | Remove the pointless LLClientView.m_imageManager null check.Justin Clark-Casey (justincc)2012-01-041-16/+4
| | | | |/ | | | |/|
| | | * | commented out "Prevented flyoff" log message for now as this becomes problema...Justin Clark-Casey (justincc)2012-01-031-1/+1
| | * | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-035-13/+26
| | |\ \
| | * \ \ Merge branch 'new_modules'BlueWall2012-01-033-5/+103
| | |\ \ \
| | | * | | Profile UpdatesBlueWall2012-01-033-5/+103
* | | | | | Clean up GetWorldPositionMelanie2012-01-051-7/+3
* | | | | | Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|/ / / / /
* | | | | 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
|\ \ \ \ | |/ / /