ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 14:35:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,417 Commits 5 Branches 93 Tags
36c4e94ef739f2d58ff26ae2313e5a930ff02021
Commit Graph

1669 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
36c4e94ef7 Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters. 
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
 2011-04-18 23:22:04 +01:00
Justin Clark-Casey (justincc)
f5a041d012 bump default IAR version to 0.2 and 1.1 for the --profile version. 
There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
 2011-04-18 23:00:41 +01:00
Justin Clark-Casey (justincc)
6109605038 bump oar version number to 0.6. 
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
 2011-04-18 22:42:36 +01:00
Justin Clark-Casey (justincc)
6600aa2baf Add regression test to check that OARs start with the control file. 2011-04-18 22:35:33 +01:00
Justin Clark-Casey (justincc)
e00e518692 add test to ensure that an IAR starts with the control file 2011-04-18 22:24:42 +01:00
Justin Clark-Casey (justincc)
61619ddefc refactor: split out the code which actually copies a particular bundle to inventory 2011-04-18 21:59:01 +01:00
Justin Clark-Casey (justincc)
71114d4ad1 refactor: rename DeleteToInventory() to CopyToInventory() 
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
 2011-04-18 21:34:26 +01:00
Justin Clark-Casey (justincc)
5a404a9ab1 Fix bug where objects were being coalesced in the wrong positions. 
This addresses http://opensimulator.org/mantis/view.php?id=5441
The bug was due to a pre-existing mistake in creating the inventory stored position
 2011-04-18 21:07:11 +01:00
Justin Clark-Casey (justincc)
419fc9427e Provide a configuration setting to control whether multiple taken objects are coalesced to inventory 
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
 2011-04-18 20:03:53 +01:00
Diva Canto
cd6dce1108 Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't). 2011-04-15 16:42:40 -07:00
Justin Clark-Casey (justincc)
1dba671f45 refactor: separate out code that adds permissions 2011-04-15 23:32:46 +01:00
Justin Clark-Casey (justincc)
9c7f14bf36 minor: remove a small amount of code duplication 2011-04-15 23:07:23 +01:00
Justin Clark-Casey (justincc)
98c5ed2c79 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-15 22:49:59 +01:00
Justin Clark-Casey (justincc)
52d9230392 refactor: split out some rez code into a separate CreateItemForObject() method 2011-04-15 22:47:47 +01:00
BlueWall
37d2b6243b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-14 21:16:30 -04:00
BlueWall
40bf417da7 Add ColladaMesh switch 2011-04-14 21:15:42 -04:00
Justin Clark-Casey (justincc)
66a62678e5 get rid of all traces of the now used mock service infrastructure 2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc)
ad70cddcfc extend TestLoadCoalesecedItem() to check loaded object ids and positions 2011-04-15 00:56:40 +01:00
Justin Clark-Casey (justincc)
a0d80140f2 Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. 
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object.  However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
 2011-04-15 00:42:06 +01:00
Justin Clark-Casey (justincc)
821e67fb95 implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. 2011-04-14 20:59:52 +01:00
Justin Clark-Casey (justincc)
55387542ea simplify InventoryArchiveTestCase setup 2011-04-14 20:35:00 +01:00
Justin Clark-Casey (justincc)
1569148b49 simplify TestSaveItemToIarV0_1() 2011-04-14 20:32:27 +01:00
Justin Clark-Casey (justincc)
e439264824 simplify TestRezObject() 2011-04-14 20:23:48 +01:00
Justin Clark-Casey (justincc)
c644ab6a2c Make scene object parts created by the test utils unit sized. 2011-04-14 20:21:44 +01:00
Justin Clark-Casey (justincc)
aaf9125869 simplify coalesced object tests by using existing scene object set up utils 
this change makes it possible to set an absolute position on a group before it is put into a scene.
 2011-04-14 17:33:55 +01:00
Justin Clark-Casey (justincc)
c5465414b6 Use common coalesced serialization code for both tests and the InventoryAccessModule. 
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
 2011-04-13 22:55:26 +01:00
Justin Clark-Casey (justincc)
c81f5bfc5c Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers. 
Extend test to check position of objects in the rezzed coalescence.
 2011-04-13 22:29:12 +01:00
Justin Clark-Casey (justincc)
68cc5b46fe refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer. 2011-04-13 21:48:16 +01:00
Justin Clark-Casey (justincc)
d8d28c3737 Fix bug where rezzing coalesced objects would give all objects the same name as the item. 
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
 2011-04-13 21:31:45 +01:00
Justin Clark-Casey (justincc)
58efd761d1 Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test. 
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
 2011-04-13 21:17:43 +01:00
Justin Clark-Casey (justincc)
08fd1d9bbd factor out some test code into the SetUp() 2011-04-13 18:11:04 +01:00
Justin Clark-Casey (justincc)
6613daa82a Add a regression test for rezzing a single object into a scene from user inventory 2011-04-13 17:46:36 +01:00
Diva Canto
7592a033df Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. 2011-04-12 20:24:28 -07:00
Diva Canto
16c911dcbb Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png. 2011-04-12 19:46:27 -07:00
Justin Clark-Casey (justincc)
b0889ed92a refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte 2011-04-12 22:30:43 +01:00
Justin Clark-Casey (justincc)
98d7de22dc Fix (add) ability to rez objects by dragging them out of another prim's inventory. 
This should happen if the client supplies a task ID with the RezObject call.
The rez goes through the same code as llRezObject(), so the same perms are applied.
Rotation isn't yet preserved, this should be fixed shortly.
 2011-04-12 18:31:41 +01:00
Justin Clark-Casey (justincc)
64dc7e9f14 minor: remove now inaccurate comment 2011-04-11 22:35:07 +01:00
Justin Clark-Casey (justincc)
3a98fb080a minor: adjust some spacing and indentation 2011-04-11 22:29:08 +01:00
E. Allen Soard
464fa45ec9 Implimented HTTP_VERIFY_CERT for llHttpRequest 2011-04-11 22:22:11 +01:00
Justin Clark-Casey (justincc)
8318915d7e Signal prim count taint if the AbsolutePosition of a scene object changes. 
This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules)
Create TestMoveOwnerObject() regression test for this case.
 2011-04-06 20:48:00 +01:00
Justin Clark-Casey (justincc)
63533412f8 Improve previous ILandObject method doc. 
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
 2011-04-06 18:57:50 +01:00
Justin Clark-Casey (justincc)
fa202a05e9 Add method doc to some land bitmap methods in ILandObject. 
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
 2011-04-06 17:19:31 +01:00
Justin Clark-Casey (justincc)
acacee98c6 properly refresh object owner list when refresh button is hit on land parcel object tab 2011-04-05 22:15:06 +01:00
Justin Clark-Casey (justincc)
0e465da187 remove now unused individual LandData prim counts. 
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
 2011-04-05 21:25:54 +01:00
Justin Clark-Casey (justincc)
3d400fc663 If an object is selected, then don't include it in owner/group/others prim counts. 
This fixes the total prim count that the viewer displays when prims are selected - it appears to ignore the total that we pass it and adds up the counts separately.
 2011-04-05 18:24:23 +01:00
Justin Clark-Casey (justincc)
f58941e89f Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns). 
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
 2011-04-05 01:30:13 +01:00
Melanie
adb14ad20a Implement rezzing coalesced objects 2011-04-03 20:32:04 +01:00
Melanie
a4b3439025 Implement rezzing coalesced objects 2011-04-03 20:26:18 +01:00
Melanie
b385d4aa03 Implement taking of coalesced objects. 
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
 2011-04-03 20:24:44 +01:00
Justin Clark-Casey (justincc)
4f56c732bc Comment out some startup logging lines to make up for the one I added earlier on. 
Most of these are where the region modules are telling us they are disabled.  Convention is only to log when enabled (even that is really noisy)
 2011-04-02 02:29:42 +01:00