Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 3 | -2/+28 | |
| |/ | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 2 | -56/+51 | |
|\ \ | |/ | ||||||
| * | Fix: Allow use of parameters without specifying a file path with command ↵ | Marck | 2010-11-23 | 1 | -1/+1 | |
| | | | | | | | | "save oar" | |||||
| * | Only perform the take object permissions check if an object is being ↵ | Justin Clark-Casey (justincc) | 2010-11-23 | 1 | -55/+50 | |
| | | | | | | | | attached directly from the scene, not from existing inventory | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 16 | -194/+651 | |
|\ \ | |/ | ||||||
| * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 6 | -30/+92 | |
| | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | |||||
| * | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 6 | -5/+333 | |
| | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | |||||
| * | Knock V0_2 decals off archive tests since they're misleading | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -8/+8 | |
| | | ||||||
| * | Fix unit tests and save problems | Justin Clark-Casey (justincc) | 2010-11-20 | 3 | -3/+4 | |
| | | | | | | | | | | | | (note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly). Firstly, if you can save a version 1.0 OAR then you can load it too. Secondly, closing the save stream even on success before assets/objects are saved is a bad idea | |||||
| * | correct build break. for some reason, xbuild didn't rebuild test dlls | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -53/+74 | |
| |\ | ||||||
| | * | Fixed appearance send for avatars with only default textures. This should ↵ | Master ScienceSim | 2010-11-18 | 1 | -53/+74 | |
| | | | | | | | | | | | | | | | | | | fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes. Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | Bump oar version to 1.0 from 0.5 | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -83/+119 | |
| |/ | | | | | | | | | | | | | | | If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved Also closes save stream properly in the event of an error Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line e.g. save oar --version=0 oars/test.oar | |||||
| * | minor: add some method comments | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -2/+7 | |
| | | ||||||
| * | Fix gesture and viewer preview sounds not playing | Melanie | 2010-11-17 | 1 | -7/+13 | |
| | | ||||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 2 | -27/+25 | |
| | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | |||||
* | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 6 | -52/+59 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Remove a debug spam | Melanie | 2010-11-10 | 1 | -1/+0 | |
| | | ||||||
| * | Although the Allow Voice setting is per estate rather than per region, | Melanie | 2010-11-09 | 1 | -1/+3 | |
| | | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it. | |||||
| * | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 1 | -14/+15 | |
| | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 2 | -33/+32 | |
| | | ||||||
| * | Call attachment cleanup when an agent crosses out | Melanie Thielker | 2010-11-08 | 1 | -0/+2 | |
| | | ||||||
| * | Detach attachments displaced by other attachments | Melanie | 2010-11-08 | 1 | -4/+8 | |
| | | ||||||
* | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 5 | -50/+78 | |
|\ \ | |/ | ||||||
| * | Fix playing sound from HUDs | Melanie | 2010-11-05 | 1 | -2/+16 | |
| | | ||||||
| * | Fix attached sounds from HUDs erroneously being delivered to other avatars | Melanie | 2010-11-05 | 1 | -0/+19 | |
| | | ||||||
| * | When LightShare is enabled, the standard day cycle is bypassed and replaced by | Melanie | 2010-11-03 | 1 | -1/+2 | |
| | | | | | | | | | | | | midday defaults when no specific LightShare profile is set. This prevents LightShare info being send out when the region has no LightShare profile, allowing normal day/night cycles to happen. | |||||
| * | Old deserialization can't deal with commas in flag fields. Making use of ↵ | Diva Canto | 2010-11-02 | 2 | -16/+10 | |
| | | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. | |||||
| * | Thanks Snoopy for a patch that addresses Mantis #0005165: ↵ | dahlia | 2010-11-02 | 1 | -32/+32 | |
| | | | | | | | | | | | | osSetDynamicTextureURL crashed region server Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-31 | 1 | -2/+2 | |
|\ \ | |/ | ||||||
| * | Removed a couple of very verbose debug messages. | Diva Canto | 2010-10-31 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -5/+10 | |
|\ \ | |/ | ||||||
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 1 | -5/+10 | |
| | | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2. | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵ | Teravus Ovares (Dan Olivares) | 2010-10-30 | 1 | -1/+1 | |
| | | | | | | | | to using prim.GetWorldPosition() in the warp renderer. | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 3 | -37/+10 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -10/+5 | |
| |\ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 5 | -39/+29 | |
| | |\ | ||||||
| | * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -10/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | |||||
| * | | | minor: remove some old commented out code | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -22/+0 | |
| | |/ | |/| | ||||||
| * | | Change level of some logging messages, turning some info into arguably more ↵ | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -5/+6 | |
| | | | | | | | | | | | | appropriate debug to reduce console spam when log level is info | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 4 | -34/+23 | |
|\ \ \ | |/ / | ||||||
| * | | Rationalize the logging messages from the merged appearance branch, ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -29/+18 | |
| | | | | | | | | | | | | commenting out most of them as per Mic | |||||
| * | | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 3 | -5/+5 | |
| |\ \ | | |/ | |/| | ||||||
| | * | for now, comment out some older or redundant log debug lines to make ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 3 | -5/+5 | |
| | | | | | | | | | | | | diagnostics easier | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -43/+62 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 2 | -43/+62 | |
| | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 8 | -144/+317 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -4/+14 | |
| | | | ||||||
| * | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 7 | -71/+111 | |
| |\ \ | | |/ |