aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * Re-Adding Scene TimeDilation to Object Update Packets.Teravus Ovares (Dan Olivares)2010-12-231-1/+3
| | | | | | * Added Calculating Time Dilation in the OdePlubin * When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise. * Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
* * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-211-0/+2
| | | | | | * Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
* Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-202-8/+8
|
* Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-171-2/+2
|
* Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-3/+4
| | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
|
* Added ability for GetTexture to serve multiple formats. The format may come ↵Diva Canto2010-12-081-0/+81
| | | | 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 mantis5110Jonathan Freedman2010-12-0511-178/+438
|\
| * Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-032-10/+30
| | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging.
| * Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-0/+12
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-293-30/+27
| |\
| | * Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-272-28/+17
| | | | | | | | | | | | | | | | | | | | | 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 handling of landmarks for systems with culture settings other than ↵Marck2010-11-261-2/+10
| | | | | | | | | | | | en_US. This fixes Mantis #5177.
| * | Fix unit test.Diva Canto2010-11-291-0/+6
| | |
| * | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-295-113/+139
| | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
| * | Changed the parser for InventoryItem deserialization. Moved some utility ↵Diva Canto2010-11-272-30/+229
| |/ | | | | | | functions around.
| * Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-1/+1
| |
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-232-1/+2
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-231-1/+1
| |\
| | * Initialize InventoryItemBase.creatorData properly. Could throw.Diva Canto2010-11-231-1/+1
| | |
| * | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-0/+1
| |/
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-215-3/+123
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-212-0/+106
| | | | | | | | | | | | 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).
| * small refactor: reuse existing commandLine string rather than calling ↵Justin Clark-Casey (justincc)2010-11-171-1/+1
| | | | | | | | cmdline.ToString() again
| * save all lines to history, not just those which turn out to be valid ↵Justin Clark-Casey (justincc)2010-11-171-2/+7
| | | | | | | | | | | | | | comands. does not store passwords also, blank lines are not stored to history this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
| * minor: add some method commentsJustin Clark-Casey (justincc)2010-11-171-0/+8
| |
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
| | | | | | | | | | | | | | 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 mantis5110Jonathan Freedman2010-11-214-48/+47
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Formatting cleanup.Jeff Ames2010-11-084-48/+47
| |
* | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-056-4/+46
|\ \ | |/
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-031-0/+1
| | | | | | | | | | | | 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.
| * Admin Server can now bind to a private ip addressmores2010-11-031-0/+9
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Fix default club feetMelanie2010-11-021-1/+1
| |
| * Add support for cross-domain AJAX requests to REST console.Marck2010-11-021-0/+31
| | | | | | | | | | | | Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code. The WifiConsole uses this functionality with grid mode.
| * Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| |
| * Try to not make avatars switch outfitsMelanie2010-11-021-3/+0
| |
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-16/+58
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-302-16/+58
| | | | | | | | | | | | 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 mantis5110Jonathan Freedman2010-10-301-4/+0
|\ \ | |/
| * On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
| | | | | | | | | | tattoo and alpha layers. Any change of appearance in the sim makes the green gnome reappear on next login. Progress of sorts.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-305-319/+151
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
| |
| * This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-302-3/+8
| | | | | | | | client displays a blank error box.
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-23/+16
| |\
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-305-316/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-23/+16
|\ \ \ | | |/ | |/|
| * | Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-292-23/+16
| |/ | | | | | | commenting out most of them as per Mic
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-19/+116
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-294-157/+207
| |\
| | * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-18/+17
| | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.