| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 2 | -1/+5 |
| |\ | |||||
| | * | Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling | Melanie | 2012-01-06 | 2 | -1/+5 |
| | | | | | | | | | | | any methods, even those without threat, automatically. It is for use with setups wanting to allow only specific methods to specific users. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 9 | -22/+404 |
| |\ \ | |/ | | | | | | | 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-05 | 3 | -8/+39 |
| | | | | | | | | | 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-05 | 3 | -9/+163 |
| | | | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes. | ||||
| | * | Make "show asset" command available simulator side. Actually make the ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -0/+51 |
| | | | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message. | ||||
| | * | Move simulator asset info commands to an optional module from the connector. ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 2 | -3/+136 |
| | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | ||||
| | * | recomment log messages I accidentally left uncommented | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -6/+6 |
| | | | |||||
| | * | Improve "app rebake" command to return a better message if no uploaded ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 4 | -12/+25 |
| | | | | | | | | | texture ids were available for the rebake request | ||||
| | * | Commenting out DataSnapShot message "Registering service discovery ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | capability" for now. Please uncomment if/when needed. | ||||
| * | | That needs to be callable from elsewhere! | Melanie | 2012-01-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-05 | 14 | -76/+328 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 15 | -83/+331 |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-05 | 11 | -75/+225 |
| | | |\ | |||||
| | | | * | Add "appearance rebake" command to ask a specific viewer to rebake textures ↵ | Justin Clark-Casey (justincc) | 2012-01-04 | 2 | -4/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the server end. This is not as useful as it sounds, since you can only request rebakes for texture IDs already received. In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect. Nonetheless, this is useful for diagnostic/debugging purposes. | ||||
| | | | * | Separate out rebake request code from cache validation code AvatarFactoryModule. | Justin Clark-Casey (justincc) | 2012-01-04 | 2 | -31/+63 |
| | | | | | | | | | | | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command). | ||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-04 | 2 | -0/+25 |
| | | | |\ | |||||
| | | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-01-04 | 1 | -16/+4 |
| | | | | |\ | |||||
| | | | | * | | Added EventManager.OnRegionStarted which is triggered when Heartbeat is started. | Dan Lake | 2012-01-04 | 2 | -0/+25 |
| | | | | | | | |||||
| | | | * | | | Minor formatting changes and commented out log lines for future debugging of ↵ | Justin Clark-Casey (justincc) | 2012-01-04 | 4 | -22/+80 |
| | | | | |/ | | | |/| | | | | | | | | | | | image manager (udp texture fetch). No significant functional changes. | ||||
| | | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -4/+4 |
| | | | |\ \ | | | | |/ | |||||
| | | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-01-03 | 26 | -776/+513 |
| | | | | |\ | |||||
| | | | | * | | Access to these static methods to serialize objects are useful outside of ↵ | Dan Lake | 2012-01-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | serializer | ||||
| | | | * | | | Remove the pointless LLClientView.m_imageManager null check. | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -16/+4 |
| | | | | |/ | | | |/| | | | | | | | | | | | Despite the code comments we never actually null it. | ||||
| | | | * | | commented out "Prevented flyoff" log message for now as this becomes ↵ | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed. | ||||
| | | * | | | Small fix to GetWorldPosition to get closer to Avination sit behavior | Melanie | 2012-01-05 | 1 | -10/+4 |
| | | |/ / | |||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-03 | 5 | -13/+26 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'new_modules' | BlueWall | 2012-01-03 | 3 | -5/+103 |
| | | |\ \ \ | |||||
| | | | * | | | Profile Updates | BlueWall | 2012-01-03 | 3 | -5/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 GetWorldPosition | Melanie | 2012-01-05 | 1 | -7/+3 |
| | | | | | | | |||||
| * | | | | | | Prevent spurious "CHANGED_POSITION" during region backup | Melanie | 2012-01-05 | 1 | -3/+4 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 17 | -546/+145 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | Reduce accessibility of some J2KImage/LLImageManager properties and methods ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | to reduce potential code complexity and make code reading easier. | ||||
| | * | | | | Adding commented out log messages and some minor formatting for future bug ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 4 | -1/+14 |
| | |/ / / | | | | | | | | | | | | | hunting. No functional changes. | ||||
| | * | | | Fix for failed http request status | BlueWall | 2012-01-01 | 1 | -14/+17 |
| | |/ / | | | | | | | | | | Thanks "sendapatch" for fixes to llHTTPRequest status reporting. | ||||
| | * | | Bug fix in map tiles in standalone: the map has been blank since commit ↵ | Diva Canto | 2011-12-30 | 1 | -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 Canto | 2011-12-29 | 7 | -36/+80 |
| | | | | | | | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account. | ||||
| | * | | Deleted two obsolete files in Inventory modules. | Diva Canto | 2011-12-29 | 2 | -460/+0 |
| | | | | |||||
| | * | | Deleted unused methods from HGAssetBroker | Diva Canto | 2011-12-29 | 1 | -18/+0 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-29 | 2 | -5/+13 |
| | |\ \ | |||||
| | * | | | HG: more adjustments for making HG Simian work. Added server_uri as new key ↵ | Diva Canto | 2011-12-29 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | on get_agent_home in UAS. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 2 | -4/+13 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Introduce a LightShare kill packet ans send it when needed. Currently only | Melanie | 2011-12-28 | 2 | -5/+13 |
| | |/ / | | | | | | | | | | understood by AVN v0.3 | ||||
| | * | | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+5 |
| | | | | |||||
| | * | | HG: one more adjustment with trailing /s | Diva Canto | 2011-12-23 | 1 | -2/+8 |
| | | | | |||||
| * | | | Fix permissions being lost and correct slam behavior, removing icompatible | Melanie | 2011-12-27 | 1 | -86/+72 |
| | | | | | | | | | | | | | code inherited from core and dead code. | ||||
| * | | | Remove a debug spam | Melanie | 2011-12-27 | 1 | -1/+0 |
| | | | | |||||
| * | | | Introduce a LightShare kill packet ans send it when needed. Currently only | Melanie | 2011-12-24 | 2 | -5/+13 |
| | | | | | | | | | | | | | understood by AVN v0.3 | ||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-24 | 1 | -10/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 1 | -10/+0 |
| | |\ \ \ | | |/ / | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |