Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed a few more spurious appearance saves. When an avatar | Mic Bowman | 2011-01-25 | 2 | -13/+13 |
| | | | | | | | enters a region the attachments module tries to update the appearance with attachments that are already part of the appearance. Just added a check to only save if the attachments weren't there before. | ||||
* | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-21 | 4 | -10/+11 |
| | |||||
* | For now, comment out logging messages about IM sending, since these cause ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| | | | | high spam for large group messaging | ||||
* | with mic's permission, reduce appearance, baked texture logging verbosity ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| | | | | for now | ||||
* | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -1/+1 |
| | |||||
* | Downgrade and comment out some other caps messages for now | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -5/+4 |
| | |||||
* | Fix build break | Melanie | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-18 | 3 | -4/+4 |
|\ | |||||
| * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -4/+4 |
| | | | | | | | | Didn't touch the appearance related stuff. | ||||
* | | Change gesture activation to not quash any other flags | Melanie | 2011-01-18 | 1 | -3/+3 |
|/ | |||||
* | Added a -v|verbose option to save iar. | Diva Canto | 2011-01-08 | 2 | -1/+9 |
| | |||||
* | Allow cross-scope friendships to work, and also allow other cross scope name | Melanie | 2011-01-03 | 2 | -2/+2 |
| | | | | resolution | ||||
* | Fix a broken format on an error message. Also replace yet another e.Message | Melanie | 2010-12-22 | 1 | -2/+1 |
| | | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere | ||||
* | uncomment "load iar" help lines which added the --merge option | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -5/+3 |
| | |||||
* | minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -3/+3 |
| | | | | console command isn't valid | ||||
* | Raise maximum iar version that master can load to 1.x, so that it can load ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -1/+1 |
| | | | | its own iars (oops) | ||||
* | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+16 |
| | | | | | | used by a 3rd party region module and contains non-obvious attachment specific code There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout | ||||
* | Remove the restriction that you have to be logged in when loading/saving iars | Justin Clark-Casey (justincc) | 2010-12-11 | 2 | -72/+70 |
| | | | | This is pointless as we're supplying the password on the command line | ||||
* | If we're saving an IAR with --profile information, then label this a version ↵ | Justin Clark-Casey (justincc) | 2010-12-11 | 1 | -5/+22 |
| | | | | 1.0 IAR since it isn't compatible with older OpenSim releases. | ||||
* | Fixed wrong comment | Diva Canto | 2010-12-08 | 1 | -1/+1 |
| | |||||
* | Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵ | Diva Canto | 2010-12-08 | 1 | -1/+1 |
| | | | | yet... | ||||
* | Added ability for GetTexture to serve multiple formats. The format may come ↵ | Diva Canto | 2010-12-08 | 1 | -42/+202 |
| | | | | as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>. | ||||
* | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 5 | -101/+145 |
|\ | |||||
| * | Various bug fixes for appearance handling: more aggressive reset of textures ↵ | Mic Bowman | 2010-12-03 | 1 | -36/+63 |
| | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -24/+6 |
| |\ | |||||
| | * | Refactor appearance and avatar data sending code. Paritioning the routines ↵ | Mic Bowman | 2010-11-27 | 1 | -24/+6 |
| | | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes. | ||||
| * | | Fix unit test. | Diva Canto | 2010-11-29 | 3 | -9/+16 |
| | | | |||||
| * | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 4 | -35/+63 |
| |/ | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -55/+50 |
|\ \ | |/ | |||||
| * | 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 | 3 | -77/+94 |
|\ \ | |/ | |||||
| * | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 1 | -2/+8 |
| | | | | | | | | | | | | | | 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. | ||||
| * | 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> | ||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -22/+12 |
| | | | | | | | | | | | | | | 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 | 2 | -36/+39 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 2 | -33/+32 |
| | | |||||
| * | Detach attachments displaced by other attachments | Melanie | 2010-11-08 | 1 | -4/+8 |
| | | |||||
* | | 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 | 2 | -32/+5 |
|\ \ | |/ | | | | | | | | | 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 | 1 | -29/+18 |
| | |\ | |||||
| | * | | 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 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -29/+18 |
|\ \ \ | |/ / | |||||
| * | | 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 '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 | 5 | -101/+286 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -4/+14 |
| | |