Commit Graph

140 Commits

Author SHA1 Message Date
Dahlia Trimble
00d042f3d1 Thanks Michelle Argus for Mantis #0003742: Terrain editor - Flatten tool lowers Land 2009-06-18 23:02:12 +00:00
Arthur Valadares
f243dddc04 * Corrected CAPS namespaces
* "luke, use the sed"
2009-06-18 14:33:35 +00:00
Melanie Thielker
664dd58cd9 Fixes Mantis #3793 . Committing thomax/Snoopy's patch to allow deeding of 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.
2009-06-14 21:44:34 +00:00
Justin Clarke Casey
9f2ddfd167 * Temporarily resolve another problem in http://opensimulator.org/mantis/view.php?id=3741 by disabling the loading of OAR creation information 2009-06-12 20:00:26 +00:00
Justin Clarke Casey
cb6baacc31 * minor: remove one mono warning 2009-06-12 14:29:42 +00:00
Justin Clarke Casey
874df490fb * fix build break: sigh, must remember to build before committing 2009-06-12 14:23:31 +00:00
Justin Clarke Casey
4e526778b7 * minor: make control file loading code consistent 2009-06-12 14:18:01 +00:00
Justin Clarke Casey
15b8641bef * minor: if OAR saving receives assets after timeout, just print warning, don't accidentally go on to process them 2009-06-12 14:00:50 +00:00
Justin Clarke Casey
86043c431f * minor: remove warning from unused field 2009-06-12 13:37:08 +00:00
Jeff Ames
a23d64dec1 Formatting cleanup. 2009-06-10 04:28:56 +00:00
Jeff Ames
a7fcacf8f3 Formatting cleanup. Ignore some generated files. 2009-06-09 18:07:35 +00:00
Melanie Thielker
9c726fb178 Thank you Snoopy, for a patch that implements group permissions.
Applied with changes:
- removed spammy debug message
- corrected tab formatting
2009-06-09 08:15:34 +00:00
Justin Clarke Casey
593942b195 * Fix problem where known missing assets would stop save oar ever completing
* 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
2009-06-05 16:14:22 +00:00
Justin Clarke Casey
bfea077508 * Add oar saving timeout
* 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
2009-06-05 13:48:43 +00:00
Melanie Thielker
9f932a4205 Thank you, thomax, for a patch to provide finer-grained access control to
scripting.
Fixes Mantis #2862
2009-06-05 09:47:42 +00:00
Dr Scofield
717fd3b5b9 From: Chris Yeoh <yeohc@au1.ibm.com>
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.
2009-06-03 12:48:04 +00:00
Justin Clarke Casey
5c42143a7b * Add simple original xml serialization test 2009-06-02 15:24:29 +00:00
Justin Clarke Casey
412295ccde * Add simple original sog xml serialization test 2009-06-01 18:03:51 +00:00
Justin Clarke Casey
f6badc528b * minor: change the name of one serialization method to match its counterpart 2009-06-01 17:38:11 +00:00
Justin Clarke Casey
ecbeb5cea1 * Fix race condition in save oar 2009-06-01 16:00:46 +00:00
Jeff Ames
840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Justin Clarke Casey
4aad6a07ff * refactor: Remove redundent prim id attribute on Scene.AddSceneObject() 2009-05-29 21:01:18 +00:00
Justin Clarke Casey
6eb191c87b * Add save xml2 serialization test 2009-05-29 20:20:47 +00:00
Justin Clarke Casey
9021bb231c * minor: move common serialization test code into fixture setup 2009-05-29 16:27:43 +00:00
Justin Clarke Casey
fa04937a82 * Add xml2 load test 2009-05-29 16:11:33 +00:00
Adam Frisby
a7b49084ad * May make the terrain flatten brush behave like Second Life(tm)'s client expects. May break everything. You decide! 2009-05-28 15:27:15 +00:00
Melanie Thielker
4e64bf9360 Prevent group deeded objects from being returned by the group return option
unless the user has that permission through the group.
2009-05-24 17:29:40 +00:00
Melanie Thielker
ca75c101ec Allow the perms module to inspect and modify the list of objects to return
for more fine-grained control
2009-05-24 17:20:47 +00:00
Melanie Thielker
c028d0a3c1 Make group permissions control what a user can return. 2009-05-24 16:55:34 +00:00
Melanie Thielker
f3f7d60367 Add a new permissions check for bulk object returns. 2009-05-24 16:11:35 +00:00
Justin Clarke Casey
01ca3a91ad * Take another attempt at http://opensimulator.org/mantis/view.php?id=3191
* Return something more sensible if a file isn't found
2009-05-19 19:41:01 +00:00
Justin Clarke Casey
1cc9d1fd8d * minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191
* didn't realize that we were getting back plain old exceptions
2009-05-18 18:44:55 +00:00
Justin Clarke Casey
29671fc103 * Resolve http://opensimulator.org/mantis/view.php?id=3191
* Catch directory exception on load oar as well as file exception
2009-05-18 18:22:15 +00:00
Justin Clarke Casey
ad7214620f * Re-enable save oar test by loading asset data plugins from test mock class
* 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
2009-05-18 17:46:14 +00:00
Dr Scofield
e3f2cfa1ca From: Alan Webb <alan_webb@us.ibm.com>
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)
2009-05-18 10:04:28 +00:00
Charles Krinke
74f1c16c49 Thank you kindly, Jonc, for a patch that solves
the issue of a console command 'export-map file.jpg'
having the map flipped when exported.
2009-05-17 18:09:39 +00:00
Justin Clarke Casey
c11e047410 * Resolve bug where save oar would never complete if any assets were missing 2009-05-15 20:20:55 +00:00
diva
5e4fc6e91e Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- 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
2009-05-15 05:00:25 +00:00
Justin Clarke Casey
6277156044 * When saving an oar, save assets when immediately received rather than 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
2009-05-14 20:37:54 +00:00
Justin Clarke Casey
02bac7fea4 * refactor: move SceneXmlLoader into subpackage 2009-05-14 18:46:17 +00:00
Justin Clarke Casey
d10b5e29bc * refactor: break some of xml2 serialization out of sog 2009-05-14 16:33:04 +00:00
Melanie Thielker
68da7d1a43 Correctly reset the group ownership flag when a parcel is reclaimed. 2009-05-12 13:48:55 +00:00
Melanie Thielker
e1750c8c7c Hook up deed permissions checking to the land module 2009-05-12 13:41:30 +00:00
Melanie Thielker
32ac388363 Add permission mechanisms for group deeding land 2009-05-12 13:29:38 +00:00
Charles Krinke
c1d680b6c3 Thank you kindly, Patnad, for a patch that:
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.
2009-05-12 03:30:37 +00:00
Melanie Thielker
d8e1842d25 Add some asset cache plumbing. Change the generic cache from UUID to string
keys to allow caching the new crop of URI identified objects.
2009-05-10 12:27:05 +00:00
Sean Dague
6d36985bbc remove misleading comment 2009-05-07 19:37:25 +00:00
Sean Dague
ce0a84cbc0 instrument most of the tests with a new InMethod function that may help us figure
out where that pesky deadlock is during test runs.
2009-05-07 19:07:08 +00:00
Justin Clarke Casey
7440681062 minor: Inconsquential change to provoke another build 2009-05-07 13:59:38 +00:00
Melanie Thielker
acfb5051cd Intermediate commit. WILL NOT COMPILE! 2009-05-04 20:15:39 +00:00