Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes Mantis #3793 . Committing thomax/Snoopy's patch to allow deeding of ↵ | Melanie Thielker | 2009-06-14 | 1 | -1/+16 |
| | | | | | | | | | | objects, with changes: - Set OwnerID = GroupID for deeded objects. - Close a security loophole that would have allowed a user with deed rights in a group to deed ANY object to that group, even if it's not owned by them and/or not set to that group - Set LastOwnerID correctly. Handle objects vs. prims correctly. | ||||
* | * Temporarily resolve another problem in ↵ | Justin Clarke Casey | 2009-06-12 | 1 | -2/+4 |
| | | | | http://opensimulator.org/mantis/view.php?id=3741 by disabling the loading of OAR creation information | ||||
* | * minor: remove one mono warning | Justin Clarke Casey | 2009-06-12 | 1 | -1/+0 |
| | |||||
* | * fix build break: sigh, must remember to build before committing | Justin Clarke Casey | 2009-06-12 | 1 | -2/+1 |
| | |||||
* | * minor: make control file loading code consistent | Justin Clarke Casey | 2009-06-12 | 2 | -18/+12 |
| | |||||
* | * minor: if OAR saving receives assets after timeout, just print warning, ↵ | Justin Clarke Casey | 2009-06-12 | 1 | -0/+2 |
| | | | | don't accidentally go on to process them | ||||
* | * minor: remove warning from unused field | Justin Clarke Casey | 2009-06-12 | 1 | -5/+0 |
| | |||||
* | Formatting cleanup. | Jeff Ames | 2009-06-10 | 1 | -1/+1 |
| | |||||
* | Formatting cleanup. Ignore some generated files. | Jeff Ames | 2009-06-09 | 1 | -19/+19 |
| | |||||
* | Thank you Snoopy, for a patch that implements group permissions. | Melanie Thielker | 2009-06-09 | 1 | -131/+246 |
| | | | | | | | | Applied with changes: - removed spammy debug message - corrected tab formatting | ||||
* | * Fix problem where known missing assets would stop save oar ever completing | Justin Clarke Casey | 2009-06-05 | 1 | -1/+3 |
| | | | | | | | | | * Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response * So make asset service return http status NOT FOUND rather than OK in accordance with REST * and interpret this correctly in the async response so that a null object is sent back * This means that this fix won't be active until both region simulator and server reach this revision | ||||
* | * Add oar saving timeout | Justin Clarke Casey | 2009-06-05 | 2 | -1/+128 |
| | | | | | | | | | * If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds * Timeout executes abort, since missing assets in an OAR seems bad * This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service * This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem | ||||
* | Thank you, thomax, for a patch to provide finer-grained access control to | Melanie Thielker | 2009-06-05 | 1 | -0/+69 |
| | | | | | | | scripting. Fixes Mantis #2862 | ||||
* | From: Chris Yeoh <yeohc@au1.ibm.com> | Dr Scofield | 2009-06-03 | 2 | -0/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds oar file date and time (UTC) meta data to an oar file when it is created. It also adds a unique ID, though this id does not in anyway identify the machine that the oar file was created on. When an oar file with this meta data is loaded this extra information is saved with the region settings and available via LSL through: - osLoadedCreationDate() - osLoadedCreationTime() - osLoadedCreationID() If there is no meta data these fields will be blank. Subsequent oar file loads will erase the information for the previous oar file load. Persistence has only been implemented for MySQL, the other backends need updating. Overall this allows us to much more easily identify the specific version of software that clients are using. Its very straightforward to edit the oar file to change the ID string to be something more human friendly. Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql required for the MySQL DB migration. btw I had a chat with justincc about this a few weeks ago since he wrote the oar file import/export and he sounded happy to accept something that included date/time information but didn't want anything that would silently leak private information like machine names. | ||||
* | * Add simple original xml serialization test | Justin Clarke Casey | 2009-06-02 | 2 | -11/+75 |
| | |||||
* | * Add simple original sog xml serialization test | Justin Clarke Casey | 2009-06-01 | 2 | -17/+18 |
| | |||||
* | * minor: change the name of one serialization method to match its counterpart | Justin Clarke Casey | 2009-06-01 | 3 | -6/+130 |
| | |||||
* | * Fix race condition in save oar | Justin Clarke Casey | 2009-06-01 | 3 | -28/+46 |
| | |||||
* | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 63 | -63/+63 |
| | | | | LICENSE.txt. | ||||
* | * refactor: Remove redundent prim id attribute on Scene.AddSceneObject() | Justin Clarke Casey | 2009-05-29 | 1 | -1/+1 |
| | |||||
* | * Add save xml2 serialization test | Justin Clarke Casey | 2009-05-29 | 1 | -3/+70 |
| | |||||
* | * minor: move common serialization test code into fixture setup | Justin Clarke Casey | 2009-05-29 | 1 | -6/+17 |
| | |||||
* | * Add xml2 load test | Justin Clarke Casey | 2009-05-29 | 2 | -2/+143 |
| | |||||
* | * May make the terrain flatten brush behave like Second Life(tm)'s client ↵ | Adam Frisby | 2009-05-28 | 1 | -1/+5 |
| | | | | expects. May break everything. You decide! | ||||
* | Prevent group deeded objects from being returned by the group return option | Melanie Thielker | 2009-05-24 | 1 | -2/+22 |
| | | | | | | unless the user has that permission through the group. | ||||
* | Allow the perms module to inspect and modify the list of objects to return | Melanie Thielker | 2009-05-24 | 2 | -5/+5 |
| | | | | | | for more fine-grained control | ||||
* | Make group permissions control what a user can return. | Melanie Thielker | 2009-05-24 | 1 | -0/+32 |
| | |||||
* | Add a new permissions check for bulk object returns. | Melanie Thielker | 2009-05-24 | 2 | -0/+12 |
| | |||||
* | * Take another attempt at http://opensimulator.org/mantis/view.php?id=3191 | Justin Clarke Casey | 2009-05-19 | 1 | -12/+14 |
| | | | | | | * Return something more sensible if a file isn't found | ||||
* | * minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 | Justin Clarke Casey | 2009-05-18 | 1 | -1/+1 |
| | | | | | | * didn't realize that we were getting back plain old exceptions | ||||
* | * Resolve http://opensimulator.org/mantis/view.php?id=3191 | Justin Clarke Casey | 2009-05-18 | 1 | -4/+4 |
| | | | | | | * Catch directory exception on load oar as well as file exception | ||||
* | * Re-enable save oar test by loading asset data plugins from test mock class | Justin Clarke Casey | 2009-05-18 | 1 | -120/+120 |
| | | | | | | * Actually spit out the exception caught by the plugin loader - not much point having plugins throw exceptions if we are just going to ignore them | ||||
* | From: Alan Webb <alan_webb@us.ibm.com> | Dr Scofield | 2009-05-18 | 1 | -0/+1 |
| | | | | | | | | | Fixes: [1] Sharing exception on remote OAR management [2] Occasional 505 error talking to Tomcat [3] Occasional mono aborts caused by mlog in the script engine's app domain (mono 2.4) | ||||
* | Thank you kindly, Jonc, for a patch that solves | Charles Krinke | 2009-05-17 | 1 | -1/+1 |
| | | | | | | the issue of a console command 'export-map file.jpg' having the map flipped when exported. | ||||
* | * Resolve bug where save oar would never complete if any assets were missing | Justin Clarke Casey | 2009-05-15 | 3 | -17/+11 |
| | |||||
* | Heart surgery on asset service code bits. Affects OpenSim.ini configuration ↵ | diva | 2009-05-15 | 6 | -135/+141 |
| | | | | | | | | | | | | -- please see the example. Affects region servers only. This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing. Known problems: * HG asset transfers are borked for now * missing texture is missing * 3 unit tests commented out for now | ||||
* | * When saving an oar, save assets when immediately received rather than ↵ | Justin Clarke Casey | 2009-05-14 | 4 | -121/+122 |
| | | | | | | | | | storing them all up in memory * Hopefully this will remove out of memory problems when saving large oars on machines without much memory * It may also speed up saving of large oars | ||||
* | * refactor: move SceneXmlLoader into subpackage | Justin Clarke Casey | 2009-05-14 | 1 | -0/+1 |
| | |||||
* | * refactor: break some of xml2 serialization out of sog | Justin Clarke Casey | 2009-05-14 | 2 | -2/+4 |
| | |||||
* | Correctly reset the group ownership flag when a parcel is reclaimed. | Melanie Thielker | 2009-05-12 | 1 | -0/+1 |
| | |||||
* | Hook up deed permissions checking to the land module | Melanie Thielker | 2009-05-12 | 1 | -1/+3 |
| | |||||
* | Add permission mechanisms for group deeding land | Melanie Thielker | 2009-05-12 | 1 | -0/+18 |
| | |||||
* | Thank you kindly, Patnad, for a patch that: | Charles Krinke | 2009-05-12 | 2 | -12/+6 |
| | | | | | | | | | This is to handle the changes in the v1.23 viewer of LL regarding the adult rating. With this patch a region can be changed to the adult rating from LL viewer v1.23 and above. | ||||
* | Add some asset cache plumbing. Change the generic cache from UUID to string | Melanie Thielker | 2009-05-10 | 1 | -1/+3 |
| | | | | | | keys to allow caching the new crop of URI identified objects. | ||||
* | remove misleading comment | Sean Dague | 2009-05-07 | 1 | -3/+0 |
| | |||||
* | instrument most of the tests with a new InMethod function that may help us ↵ | Sean Dague | 2009-05-07 | 1 | -0/+3 |
| | | | | | | | figure out where that pesky deadlock is during test runs. | ||||
* | minor: Inconsquential change to provoke another build | Justin Clarke Casey | 2009-05-07 | 1 | -1/+1 |
| | |||||
* | Intermediate commit. WILL NOT COMPILE! | Melanie Thielker | 2009-05-04 | 2 | -0/+2 |
| | |||||
* | Thank you kindly, Thomax, for a patch that solves: | Charles Krinke | 2009-05-02 | 1 | -1/+1 |
| | | | | | | | | | ConfigurableWind module doesn't show any effect as time = DateTime.Now.TimeOfDay.Seconds / 86400; calculates 0. | ||||
* | Estate owners who are not administrators, even in god mode, should not be | Melanie Thielker | 2009-04-30 | 1 | -1/+1 |
| | | | | | | able to edit a real god's objects. Minor tweak. |