aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Remove a dangling command registrationMelanie2012-01-051-4/+0
|
* Merge branch 'master' into careminsterMelanie2012-01-0613-183/+571
|\ | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * 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 ↵Justin Clark-Casey (justincc)2012-01-053-8/+39
| | | | | | | | | | | | decoded, instead of just success/failure
| * | 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
| | | | | | | | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| | * Make "show asset" command available simulator side. Actually make the ↵Justin Clark-Casey (justincc)2012-01-052-5/+56
| | | | | | | | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message.
| | * 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
| | | | | | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
| | * Move asset commands from AssetService to AssetServerConnector so that we can ↵Justin Clark-Casey (justincc)2012-01-052-122/+129
| | | | | | | | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change.
| | * 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 ↵Justin Clark-Casey (justincc)2012-01-054-12/+25
| | | | | | | | | | | | texture ids were available for the rebake request
| | * Commenting out DataSnapShot message "Registering service discovery ↵Justin Clark-Casey (justincc)2012-01-051-1/+1
| | | | | | | | | | | | | | | | | | capability" for now. Please uncomment if/when needed.
| * | 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
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | | 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 ↵Justin Clark-Casey (justincc)2012-01-042-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-042-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/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
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | image manager (udp texture fetch). No significant functional changes.
| | | * | | | 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 ↵Dan Lake2012-01-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serializer
| | | | * | | | 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
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | Despite the code comments we never actually null it.
| | | * | | | | Update C5.dll to version 1.1.1 from 1.1.0Justin Clark-Casey (justincc)2012-01-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C5 is a collections library and can be found at http://www.itu.dk/research/c5/ This is used in the UDP texture (image) sending code.
| | | * | | | | commented out "Prevented flyoff" log message for now as this becomes ↵Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed.
| | | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-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-026-72/+97
| |/ / / / | | | | | | | | | | | | | | | hunting. No functional changes.
| * | | | Fix for failed http request statusBlueWall2012-01-011-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 Canto2011-12-301-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.
| * | | Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-305-33/+30
| | | | | | | | | | | | | | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
| * | | Default LocalToGrid to true. Fixes minor bug introduced yesterday where old ↵Diva Canto2011-12-301-5/+1
| | | | | | | | | | | | | | | | robust UserAccount service would result is LocalToGrid at the sim being false.
| * | | Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| | | | | | | | | | | | | | | | This should make bi-directional hypergrid work.