aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-231-6/+5
|\
| * Put back a commented section of code. With some viewers, object inventoryMelanie2010-12-231-6/+5
| | | | | | | | transfers just don't start without it. Observed my Nebadon and yours truly.
* | Removed unused code -- this was the previous version of UDP texture sending, ↵Diva Canto2010-12-234-866/+0
|/ | | | which now lives entirely in LindenUDP space.
* Added a counter to NewFiles in Xfers to account for simultaneous object ↵Diva Canto2010-12-221-16/+42
| | | | inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
* Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-2/+1
| | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere
* * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-211-4/+66
| | | | | | * 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.
* uncomment "load iar" help lines which added the --merge optionJustin Clark-Casey (justincc)2010-12-181-5/+3
|
* minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵Justin Clark-Casey (justincc)2010-12-181-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-181-1/+1
| | | | its own iars (oops)
* Made the map thread request the map items asynchronously, as the name ↵Diva Canto2010-12-141-9/+71
| | | | suggested -- but with a cap of 20 async requests max at any given time.
* Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for ↵Diva Canto2010-12-143-25/+90
| | | | grided sims.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-143-120/+172
|\
| * Fix a small bug in ban list handlingMelanie2010-12-131-0/+2
| |
| * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-133-120/+170
| | | | | | | | | | | | | | 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.
* | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵Justin Clark-Casey (justincc)2010-12-141-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 iarsJustin Clark-Casey (justincc)2010-12-112-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-111-5/+22
| | | | 1.0 IAR since it isn't compatible with older OpenSim releases.
* Drop current OAR version back to 0.5 since these are currently now ↵Justin Clark-Casey (justincc)2010-12-113-35/+34
| | | | | | compatible with older OpenSim versions again. Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
* Normalization of OSSL function names.Marck2010-12-101-11/+12
| | | | | | | | | | | | | | | | | Added the following replacement functions for compliance to the OSSL standards stated on the wiki: osGetTerrainHeight osSetTerrainHeight osGetSunParam osSetSunParam osSetPenColor The functions that do not comply to the standard give a warning when used but work normally otherwise. The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour". The following two functions have been renamed because they are not enabled yet aynway: osWindParamSet => osSetWindParam osWindParamGet => osGetWindParam
* Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵Diva Canto2010-12-091-1/+1
| | | | command. mantis #5259
* Fixed wrong commentDiva Canto2010-12-081-1/+1
|
* Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵Diva Canto2010-12-081-1/+1
| | | | yet...
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-12-091-42/+202
|\
| * Added ability for GetTexture to serve multiple formats. The format may come ↵Diva Canto2010-12-081-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>.
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-092-0/+34
|/ | | | whether or not an agent is allowed there as a root agent.
* Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-052-6/+6
| | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0518-305/+737
|\
| * Simplify updating of agent inventory assets. Make newly created asset IDsMelanie2010-12-041-19/+6
| | | | | | | | random rather than using IDs known by the client ahead of time.
| * Convert the agent asset transactions module to a new style module.Melanie2010-12-043-168/+156
| | | | | | | | | | | | | | Refactor to remove the property "MyScene" and the pointless circular refs to the managing classes. Converted the module to a non-shared module. Reformatted source for 80 columns. Removed the special role the module had in the old loader.
| * Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-031-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/opensimDiva Canto2010-11-292-25/+9
| |\
| | * Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-272-25/+9
| | | | | | | | | | | | | | | | | | | | | 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 Canto2010-11-293-9/+16
| | |
| * | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-297-45/+100
| | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
| * | Creator information preserved upon HG transfers.Diva Canto2010-11-262-8/+87
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-252-1/+280
| |\ \ | | |/
| | * Export the module interface for restartMelanie2010-11-251-1/+2
| | |
| | * Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-1/+17
| | |
| | * Finish the RestartModule and fix some bugs. Add new console commands:Melanie2010-11-251-2/+60
| | | | | | | | | | | | | | | | | | region restart bluebox <msg> <time> ... region restart notice <msg> <time> ... region restart abort [<message>]
| | * Implement the restart moduleMelanie2010-11-251-2/+113
| | |
| | * Adding the skeleton for the restart moduleMelanie2010-11-241-0/+93
| | |
| * | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵Diva Canto2010-11-253-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 mantis5110Jonathan Freedman2010-11-232-56/+51
|\ \ | |/
| * Fix: Allow use of parameters without specifying a file path with command ↵Marck2010-11-231-1/+1
| | | | | | | | "save oar"
| * Only perform the take object permissions check if an object is being ↵Justin Clark-Casey (justincc)2010-11-231-55/+50
| | | | | | | | attached directly from the scene, not from existing inventory
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2116-194/+651
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-216-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 Canto2010-11-216-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 misleadingJustin Clark-Casey (justincc)2010-11-201-8/+8
| |
| * Fix unit tests and save problemsJustin Clark-Casey (justincc)2010-11-203-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