aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-062-1/+5
|\
| * Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enablingMelanie2012-01-062-1/+5
* | Fix up asset stuffMelanie2012-01-061-0/+3
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
* | Merge branch 'master' into careminsterMelanie2012-01-0613-183/+571
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-053-8/+39
| |\
| | * Improve "j2k decode" command to tell us how many layers and components were d...Justin Clark-Casey (justincc)2012-01-053-8/+39
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-0522-267/+730
| |\ \ | | |/
| | * 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-052-5/+56
| | * Add size and temporary information to "show asset" commandJustin Clark-Casey (justincc)2012-01-051-0/+2
| | * Rename 'show digest' console command to 'show asset'Justin Clark-Casey (justincc)2012-01-051-1/+1
| | * Move simulator asset info commands to an optional module from the connector. ...Justin Clark-Casey (justincc)2012-01-053-46/+138
| | * Move asset commands from AssetService to AssetServerConnector so that we can ...Justin Clark-Casey (justincc)2012-01-052-122/+129
| | * 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
| * | Merge branch 'new_modules'BlueWall2012-01-051-0/+36
| |\ \
| | * | Adding empty ISearchModule interfaceBlueWall2012-01-051-0/+36
* | | | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-0521-80/+482
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-01-0522-87/+485
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-0513-79/+229
| | |\ \ \
| | | * | | 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-0375-4683/+4784
| | | | |\ \ \
| | | | * | | | Access to these static methods to serialize objects are useful outside of ser...Dan Lake2012-01-031-4/+4
| | | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-12-2036-430/+452
| | | | |\ \ \ \
| | | | * | | | | Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-2011-35/+14
| | | * | | | | | Remove the pointless LLClientView.m_imageManager null check.Justin Clark-Casey (justincc)2012-01-041-16/+4
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Update C5.dll to version 1.1.1 from 1.1.0Justin Clark-Casey (justincc)2012-01-031-0/+0
| | | * | | | | commented out "Prevented flyoff" log message for now as this becomes problema...Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-038-5/+253
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | minor: add missing newlines to pCampbot usage statementJustin Clark-Casey (justincc)2012-01-031-4/+4
| | * | | | | | 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-037-84/+109
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Merge branch 'new_modules'BlueWall2012-01-038-5/+253
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Profile UpdatesBlueWall2012-01-038-5/+253
* | | | | | | Clean up GetWorldPositionMelanie2012-01-051-7/+3
* | | | | | | Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|/ / / / / /
* | | | | | Merge branch 'master' into careminsterMelanie2012-01-0229-652/+267
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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-026-72/+97
| |/ / / /
| * | | | 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