126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
f0bf64b6de
Merge branch 'master' into caps
2011-05-01 09:11:16 -07:00
00e94b0ba8
Check for RegionID instead of RegionHandle. Other minor tweaks
2011-04-30 16:53:11 -07:00
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
c062138dad
Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all.
2011-04-30 12:23:40 -07:00
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
0d49611f6d
Remove the scripts of the attachments in the departing region and recreate them if fail.
2011-04-29 15:52:06 -07:00
97790075fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 20:47:34 -07:00
9892e115cc
Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
2011-04-28 20:19:54 -07:00
cd7517ccb9
Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
...
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
2011-04-28 22:59:12 +01:00
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
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
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
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
6600aa2baf
Add regression test to check that OARs start with the control file.
2011-04-18 22:35:33 +01:00
e00e518692
add test to ensure that an IAR starts with the control file
2011-04-18 22:24:42 +01:00
61619ddefc
refactor: split out the code which actually copies a particular bundle to inventory
2011-04-18 21:59:01 +01:00
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
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
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
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
1dba671f45
refactor: separate out code that adds permissions
2011-04-15 23:32:46 +01:00
9c7f14bf36
minor: remove a small amount of code duplication
2011-04-15 23:07:23 +01:00
98c5ed2c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-15 22:49:59 +01:00
52d9230392
refactor: split out some rez code into a separate CreateItemForObject() method
2011-04-15 22:47:47 +01:00
37d2b6243b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 21:16:30 -04:00
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
ad70cddcfc
extend TestLoadCoalesecedItem() to check loaded object ids and positions
2011-04-15 00:56:40 +01:00
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
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
55387542ea
simplify InventoryArchiveTestCase setup
2011-04-14 20:35:00 +01:00
1569148b49
simplify TestSaveItemToIarV0_1()
2011-04-14 20:32:27 +01:00
e439264824
simplify TestRezObject()
2011-04-14 20:23:48 +01:00
c644ab6a2c
Make scene object parts created by the test utils unit sized.
2011-04-14 20:21:44 +01:00
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
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
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
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
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
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
08fd1d9bbd
factor out some test code into the SetUp()
2011-04-13 18:11:04 +01:00
6613daa82a
Add a regression test for rezzing a single object into a scene from user inventory
2011-04-13 17:46:36 +01:00
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
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
b0889ed92a
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
2011-04-12 22:30:43 +01:00
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
64dc7e9f14
minor: remove now inaccurate comment
2011-04-11 22:35:07 +01:00
3a98fb080a
minor: adjust some spacing and indentation
2011-04-11 22:29:08 +01:00
464fa45ec9
Implimented HTTP_VERIFY_CERT for llHttpRequest
2011-04-11 22:22:11 +01:00
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
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
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
acacee98c6
properly refresh object owner list when refresh button is hit on land parcel object tab
2011-04-05 22:15:06 +01:00
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
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
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
adb14ad20a
Implement rezzing coalesced objects
2011-04-03 20:32:04 +01:00
a4b3439025
Implement rezzing coalesced objects
2011-04-03 20:26:18 +01:00
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
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
7bba0177fe
If land is not group owned (group ID is always UUID.Zero) then don't check if a prim should be added to the group count
2011-04-02 01:53:47 +01:00
8e668abc6d
add test for removing group owned objects
2011-04-02 01:46:06 +01:00
01b399055b
add test for adding group object, factor out initial zero counts test
2011-04-02 01:37:46 +01:00
c13502a5cf
add remove others object prim count test
2011-04-02 01:15:17 +01:00
2c86f6ba7d
refactor: rename m_dummyUserId to m_otherUserId
2011-04-02 01:13:10 +01:00
5b0936d4b5
If the land has no group ownership (it is UUID.Zero) then don't put prims in the group count when they are also not group owned.
...
Also adds simple test for others owned count when an object is added
2011-04-02 01:07:52 +01:00
3a113f9902
A stab at making CHANGED_OWNER work
2011-04-01 22:04:29 +01:00
4d0cffa06e
If the prim count gets an object with invalid bounds, don't try to count it.
...
This appears to be the more probable explanation for some failures seen. Either we're counting attachments which are temporarily out of bounds (shouldn't be due to the IsAttachment) check or we're counting scene objects which have out of bounds co-ordinates (seems more likely)
2011-03-31 23:56:26 +01:00
6ae76ede98
suspend check that IAR control file is loaded for now
...
I was mistaken - some previous opensim versions don't save this file first. Will have to bump iar version number and only check iars after the bump
2011-03-31 23:09:06 +01:00
efd0c003a3
Put in temporary logging message to find out if scene objects are requesting land objects for co-ordinates outside the region
2011-03-31 22:47:18 +01:00
f7ed7fc05d
When a new parcel is created, make sure the prim counts are updated.
...
This is done by tainting the counts where appropriate
2011-03-30 00:42:02 +01:00
8b16f7d976
(re)implement selected prim count.
...
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
2011-03-30 00:13:07 +01:00
f754dedbef
Merge branch 'primcounts'
2011-03-29 23:08:44 +01:00
fe258753a0
disable prim count debug logging temporarily
2011-03-29 23:07:01 +01:00
d3771e5366
Added code to load a terrain tile of tiff/jpg format. Previously it only worked for one single region.
2011-03-28 16:48:12 -07:00
2d209d3844
Fix mantis #5413 . WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
2011-03-28 16:46:04 -07:00
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
541cd3e8c8
move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView
...
need to move selected prim counts from LandData/LMM still
2011-03-26 02:19:28 +00:00
bfd9cc44b4
When an object is duplicated, add the dupe to the uuid/local id indexes as well as the basic entities list.
...
Added a prim counts test to reinforce this - shift-copy was no incrementing prim count. This will sometime become a basic scene test.
New code needs to be refactored so we just call SceneGraph.AddSceneObject(). This will happen in the near future.
With this, basic owner prim counts on a single parcel appear to be working fine (with the same previous existing taint calls as used by the land management module).
More work to do.
2011-03-26 02:05:53 +00:00
cc8897fceb
Add test for PCM taint. This currently fails due to unexpected behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
...
Also adds lots of temproarily debug logging
2011-03-26 00:34:49 +00:00
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
...
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +00:00
7f5019b0f2
Add ILandObject.IPrimCounts for the new prim count module.
...
Not functional yet, but tests now act against this object rather than interrogating the module directly
2011-03-25 21:47:54 +00:00
eaa37d15f2
factor out common test setup code in PCM tests
2011-03-23 23:28:23 +00:00
f001aab8aa
extend TestAddOwnerObject() to add a second object
2011-03-23 23:19:15 +00:00
ebbe3afaf1
Add PrimCountModuleTests.TestRemoveOwnerObject().
...
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
2011-03-23 23:14:55 +00:00
de88227bc4
refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject()
2011-03-23 22:29:27 +00:00
88673c86a4
use a 3 part object for the pcm test rather than a 1 part, for improved test coverage
2011-03-23 22:17:47 +00:00
f1f4985ab6
user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero
2011-03-23 22:14:04 +00:00
654aa7abeb
Extend simple PCM add object test to check all counts
2011-03-23 22:12:20 +00:00
08c3cd6b36
Add method doc to the Get*() methods on PrimCountModule
2011-03-23 22:04:14 +00:00
67cafbd33a
remove a rogue Console.WriteLine() from the last commit.
2011-03-23 21:54:02 +00:00
d011896341
Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to listen for that rather than EventManager.OnParcelPrimCountAdd
...
OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count.
Extend automated test for this scenario.
2011-03-23 21:53:14 +00:00
b34743e5fe
Add an initial confidence-building TestAddObject() for prim counts.
2011-03-22 23:47:36 +00:00
fb890e543f
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 08:02:56 +00:00
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
9885f68f44
When setting media on a prim values, use generic object permissions instead of media permissions.
...
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate. It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
2011-03-14 22:47:14 +00:00
f6b638fec9
factor inventory file loading into its own method
2011-03-12 00:49:13 +00:00
c4060e56ef
factor out iar asset load code into its own method
2011-03-12 00:35:40 +00:00
a3c7c04ead
refactor: make boolean load indicators on load iars instance fields
2011-03-12 00:28:23 +00:00
367ed585e0
introduce iar load checks which make sure archive.xml comes first, then inventory nodes, then assets
...
this is necessary for correct loading. "save iar" always saves in this order so there shouldn't be any problems - these checks are to give better feedback to other systems that may construct IARs.
2011-03-12 00:21:52 +00:00
836ab6b0e8
Change how map blocks are encoded to make map search
...
work with viewer 2.
2011-03-10 15:23:46 -08:00
ad1dea5aff
Add test for simple case where creator account with appropriate uuid exists on the target system for an iar load
2011-03-10 22:56:11 +00:00
8d69e68311
refactor: rename test user account fields
2011-03-10 22:52:41 +00:00
9ecb745ed7
factor out common scene setup code in InventoryArchiveTestCase
2011-03-10 22:48:19 +00:00
66d2d35425
extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as well
2011-03-10 22:40:24 +00:00
ce4421497e
re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()
2011-03-10 22:38:52 +00:00
b821f748ac
For objects loaded from an IAR, make sure the CreatorID points towards the OSP resolved ID if newer CreationData is not present.
...
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
2011-03-10 21:56:15 +00:00
a151afebe3
When setting up default iar for testing, use iar archiving code rather than constructing the tar manually
2011-03-10 19:40:19 +00:00
4dd60b7dce
Change existing users load iar test so that it fulfills it's original intention (i.e. OSPA resolution, which is still active).
...
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
2011-03-10 00:19:17 +00:00
549b0ea17c
Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into a new test TestLoadIarToInventoryPaths()
2011-03-10 00:06:32 +00:00
fa1996155e
Make the item created in the default test iar an object rather than a script
2011-03-09 23:58:26 +00:00
07f68c8318
minor: change the order of some default iar setup in test case
2011-03-09 23:54:52 +00:00
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
20aeace8d7
Add log messages on teleport failure to better pin down the cause.
2011-03-09 22:03:12 +00:00
ae507bb060
Split out path tests from InventoryArchiveTests. Factor common code into test case parent
2011-03-09 01:53:27 +00:00
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
743a6b0da5
Make -m shortcut option for --merge on load iar specific. Correct some log message origins.
2011-03-08 22:44:02 +00:00
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
2e46027c14
Construct test load iar only once and reuse for each test, rather than recreating it every time
2011-03-05 02:34:44 +00:00
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
72cb498fd0
minor: Make MoapModule namespace consistent with other modules
2011-03-05 01:13:59 +00:00
481ca910da
add test for MoapModule.SetMediaUrl()
2011-03-05 01:07:05 +00:00
3c89527b22
Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
...
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script. This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00
0f545abfc1
Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values
2011-02-25 01:31:38 +00:00
939c47ac52
instead of using different default memory expiration depending on whether there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time
...
this simplifies the code
2011-02-25 01:25:38 +00:00
beff0ac32f
log actual cache directory for FlotsamAssetCache instead of always logging the default
2011-02-25 01:18:43 +00:00
197cc3883f
Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
...
There is probably an underlying bug to fix in ExpiringCache.
2011-02-25 01:16:47 +00:00
1bb0bae78a
Forces the owner of a rezzed object to be the "rezzer" of the
...
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
2011-02-22 13:30:38 -08:00
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
25265c964f
Changed console command "alert" and added new command "alert-user".
...
This addresses Mantis #4709 .
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
2011-02-16 18:36:57 +01:00
918c12c965
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 08:06:11 +00:00
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
7e21c1eadf
Hack in a crude temporary "estate show" command
...
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00:00
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
30fa5ad1e2
One more diagnosis command:
...
show caps
2011-02-05 19:21:12 -08:00
67555994ad
Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.
2011-02-05 07:55:54 -08:00
632babf8fb
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
2011-02-04 19:19:38 -08:00
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
2011-02-04 17:05:45 -08:00
1613d89383
minor: Correct misspelling of neighbour in log messages.
...
Thanks Fly-Man-
2011-02-04 20:51:51 +00:00
cf24069227
Change UpdateAgent (for changes in agent position) to be sent
...
once to each simulator rather than once to each region. This
should help with some of the delays caused by multiple outstanding
requests to a single service point.
2011-02-03 12:43:46 -08:00
8fdc810a23
Addresses mantis #5360 : CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
2011-02-03 04:07:36 -08:00
4f7cf491e6
Comment out texture CAPS 'texture not found' message for now
2011-02-02 20:02:10 +00:00
8f008f394d
Flash out the prim count module
2011-01-29 04:27:20 +00:00
e7d5ff9bd2
Create the structure of classes and interfaces to replace the cruft that
...
is in the land management module today
2011-01-29 02:24:27 +00:00
0936455725
Adding the prim count module skeleton
2011-01-28 23:44:17 +00:00
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
a0380af18f
Display supported file extensions/formats in "terrain load help" (Mantis #5349 )
2011-01-28 21:24:05 +00:00
9798b044fe
Added loading and saving of terrain files using Terragen format (Mantis #1564 )
...
Terrain files can now be loaded and saved using the Terragen (.ter) format.
Selection of the terrain file loader to use is now based on the extension
of the filename being loaded and the data is loaded using a memory stream
instead of writing it to a file and then loading it from the file.
2011-01-28 21:19:53 +00:00
188d86998d
Fix up QueryAccess to also check parcels
2011-01-28 04:09:04 +00:00
d90b0c53ec
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 02:38:14 +00:00
80bf95b7b4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 02:34:45 +00:00
5a0cb7d37e
Thank you, Goetz, for a patch to fix prim count display in cut regions.
2011-01-28 02:34:07 +00:00
f9ea5e69c5
Refactor: Break out LoadObjects() and LoadParcels() from a longer method
2011-01-27 21:07:21 +00:00
19e4473a97
Put confirmation on "land clear" command to avoid nasty accidents
2011-01-27 20:57:59 +00:00
be3685b1a2
When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
...
The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.
Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
42c0dbf49a
Show local IDs in "land show" output.
...
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
ab9a0f2f1d
Add "land clear" command
...
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
5a26dc2743
Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
...
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
e33cb3db93
remove unused CreateBaseLand()
2011-01-27 16:50:41 +00:00
a0469daf75
Implement command "land show". This shows all the parcels on the currently selected region/s
...
This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00
c4727645b8
Removed a few more spurious appearance saves. When an avatar
...
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
cc39d0bf4e
Fixes mantis #5343
2011-01-23 14:47:58 -08:00
a32381cb9b
stop extremely old region serialization commands from appearing in the console
...
as far as I know these are unused and unsupported. Please re-enable if this is not the case. This does not effect save-xml[2]/load-xml[2]
2011-01-22 00:27:34 +00:00
41105948bd
remove some mono compiler warnings
2011-01-21 23:19:52 +00:00
c383dbd06d
implement "show throttles" command for showing current agent throttles and the server settings.
...
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
58eb6b5fa3
minor: help text adjustment for "show queues"
2011-01-20 23:22:45 +00:00
df740d8e5c
remove reference to CoreModules from ClientStack.LindenUDP
...
client stack uses modules in the same way that scene does - through their interfaces
2011-01-20 23:21:25 +00:00
1baf63dbae
Move "show queues" command out of OpenSim.cs and into a separate module.
2011-01-20 22:57:12 +00:00
d3dca7d25a
For now, comment out logging messages about IM sending, since these cause high spam for large group messaging
2011-01-19 01:50:02 +00:00
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
97c0430093
Downgrade and comment out some other caps messages for now
2011-01-19 01:10:09 +00:00
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
c544f0d0c5
Prune some of the excess logging for client logins.
...
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
705f4e1e4b
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 21:46:49 +00:00
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
0fabe0e5a5
Added more debug messages under the -verbose option.
2011-01-08 16:33:33 -08:00
35a2961ccd
Added a -v|verbose option to save iar.
2011-01-08 16:17:00 -08:00
02e661f8dd
Minor additional debug message.
2011-01-07 11:39:22 -08:00
8c0e156b4d
Make HG map search consistent with new syntax for link-region, i.e. http://foo.org . Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http.
2011-01-07 11:38:54 -08:00
52f88f5739
Spawn a threadlet upon receiving requests to close agents. The operation may take too long, and we don't need to keep the caller waiting.
2011-01-07 10:04:39 -08:00
81587466e7
Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search.
2011-01-06 12:53:54 -08:00
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
135b012bbd
Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
...
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* 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.
2010-12-21 19:15:44 -05:00
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
10ae5454cb
Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time.
2010-12-14 12:16:51 -08:00
55e04e6c68
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
2010-12-14 08:11:49 -08:00
e08da02a0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 00:12:17 +00:00
e62b3dba8a
reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being 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
2010-12-14 00:11:41 +00:00
2a9f095071
Fix a small bug in ban list handling
2010-12-13 22:14:34 +00:00
9bd7f3b03a
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
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.
2010-12-13 20:35:56 +00:00
b46de6e025
Remove the restriction that you have to be logged in when loading/saving iars
...
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
373ef594ba
Drop current OAR version back to 0.5 since these are currently now 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.
2010-12-11 01:57:32 +00:00
b512ecd1dc
Normalization of OSSL function names.
...
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
2010-12-10 22:20:35 +01:00
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come 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>.
2010-12-08 18:53:15 -08:00
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
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.
2010-12-04 04:24:55 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines 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.
2010-11-27 01:14:36 +00:00
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added 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.
2010-11-25 11:14:16 -08:00
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems 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).
2010-11-21 17:19:24 -08:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. 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.
2010-11-21 13:16:52 -08:00
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
d7bca3d8e8
Fix unit tests and save problems
...
(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
2010-11-20 02:59:21 +00:00
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
f49e32bfaa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-20 02:34:27 +00:00
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
8f1a79420b
Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +00:00
43c270b536
Fix gesture and viewer preview sounds not playing
2010-11-17 18:20:24 +00:00
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
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.
2010-11-16 21:01:56 +00:00
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
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.
2010-11-03 02:04:17 +00:00
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
ed7959ddfb
Thanks Snoopy for a patch that addresses Mantis #0005165 : osSetDynamicTextureURL crashed region server
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-11-02 02:35:56 -07:00
12d61d1ef5
Merge branch 'master' into mantis5110
2010-10-31 20:50:39 -04:00
f15f0ab59b
Removed a couple of very verbose debug messages.
2010-10-31 12:11:30 -07:00
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
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.
2010-10-30 19:06:47 +01:00
09bf9d5fca
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
2010-10-30 02:26:48 -04:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
f9227977f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-30 03:07:45 +01:00
45220a6954
minor: remove some old commented out code
2010-10-30 03:01:40 +01:00
ade71c9ed7
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
2010-10-30 01:32:56 +01:00
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
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.
2010-10-30 00:41:36 +01:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
bcd784b316
for now, comment out some older or redundant log debug lines to make diagnostics easier
2010-10-29 21:49:26 +01:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
9132e251aa
Made the check for texture assets asynchronous. This is one part of
...
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
2010-10-22 23:35:01 +01:00
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
2010-10-22 23:34:53 +01:00
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
2010-10-22 23:34:44 +01:00
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
607c07b4aa
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 18:33:41 -04:00
772dbf59f3
slightly simplify oar control file loading code
2010-10-22 18:33:35 -04:00
460b9fffe5
write IAR control file first in the archive rather than last
2010-10-22 18:33:32 -04:00
e06acae965
Allow region modules to know which agents actually receive chat
2010-10-22 18:33:19 -04:00
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
199b61f1b2
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
e7f184345e
minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable
2010-10-22 01:52:19 +01:00
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
335f2ddad2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 20:26:37 -04:00
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
a7acb650d4
Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours.
2010-10-19 22:26:07 -07:00
9f975ad5aa
* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
2010-10-20 01:23:54 -04:00
087cb951e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 00:43:29 -04:00
edce4e9c67
* This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool.
2010-10-20 00:40:05 -04:00
b2c1a1c9bd
* This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization.
...
* You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
2010-10-19 01:53:56 -04:00
158e43d4fd
* Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment.
2010-10-18 23:47:35 -04:00
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
37a6be7ca9
Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it.
2010-10-19 02:20:47 +01:00
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
edc31adf95
Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all
...
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16 07:09:13 +01:00
e41b23a1a4
change --old-guids switch on the save oar command line to --version=<x>
...
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
2010-10-16 05:38:44 +01:00
3df8d8ff76
Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle
2010-10-16 04:59:51 +01:00
1bd4219078
save oar control file first rather than in the middle so that it's the first thing we come accross on load
...
this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now
2010-10-16 03:52:11 +01:00
fe4e6ff811
Fix test break - TestSerializeXml2() still requires old-guids option
2010-10-16 02:38:46 +01:00
1499607215
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-10-15 17:27:19 -07:00
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:56:08 -04:00
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
6d99f0c627
* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'
...
* At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
2010-10-14 09:34:37 -04:00
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
4adada6fe4
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-07 23:47:39 -04:00
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
7d62ab6a9e
Fix incorrect class name
2010-10-06 02:16:42 +01:00
c97398575c
Convert the map image modules to new style modules
2010-10-06 01:42:18 +01:00
593fc5c87a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 19:45:37 -04:00
5d61323192
Add the view generating method to the image generator interface
2010-10-05 23:49:21 +01:00
b424af6187
Revert an accidental default value change
2010-10-05 23:06:29 +01:00
eb491d2c36
Patch to allow other cam angles. Not complete. Thanks, Antont.
2010-10-05 22:56:20 +01:00
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
ba0a19c228
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 02:12:35 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
eb17d581d3
Make windlight set the default environment on start
2010-10-05 01:54:15 +01:00
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
2010-10-03 20:01:59 -07:00
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
189cda1c3d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-03 16:51:41 +01:00
4f70ac018b
Adapt to core changes
2010-10-03 16:40:11 +01:00
27340f616e
Addign the new / renamed files for previous commit
2010-10-03 16:34:55 +01:00
ab4be3ffdf
Initial port of the Warp3D map tile renderer
2010-10-03 16:34:17 +01:00
0133619af2
Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.
2010-10-02 17:02:02 -07:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
87c6386884
Reapplying the parts of the prior revert that were not derived from the
...
original patch
2010-10-02 18:47:26 +01:00
b01020b84a
Revert "Forward-port 0.6 fix"
...
This reverts commit 90b51dc7d6
2010-10-02 18:45:48 +01:00
eb58d91098
Prevent dropping someone else's attachments
2010-09-30 15:57:52 +01:00
90b51dc7d6
Forward-port 0.6 fix
2010-09-30 15:52:33 +01:00
1255c7ceb6
Cleanup: Removed an unreferenced variable from ActivityDetector.cs
2010-09-29 14:39:13 -07:00
b6e0563ad7
Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior
2010-09-29 14:34:02 -07:00
9b7c99f0cf
Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now
2010-09-29 14:24:32 -07:00
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
84ab4742c8
Quash the region ID on intersim messages. That prevents people from determining
...
another avatars location
2010-09-27 01:31:17 +01:00
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
dc49057c8a
Consistency patch: use Path.Combine() instead of + and eliminate the need
...
for a trailing slash on exports/
2010-09-26 20:03:00 +01:00
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
889923841c
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
...
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
2010-09-18 01:43:22 +01:00
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:57:26 +01:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
ae6682036d
Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only.
2010-09-08 14:13:01 -07:00
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
0246edc2ea
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
c947a67b23
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-01 00:17:23 +01:00
c47de94263
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:36:46 +01:00
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
83fbf66444
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-28 02:41:00 +01:00
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
0f95cd209e
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
2010-08-27 17:25:04 -07:00
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
78f452050a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-24 22:29:32 +01:00
289c21099c
Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
...
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
de85aabcbe
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
c72d298202
Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.
2010-08-23 23:25:36 +01:00
704a53fb9b
Fix bug in llGiveInventory() where items were disappearing on relog
...
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a
2010-08-23 23:16:48 +01:00
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
ea1df09fa4
Forward-port a small improvement to the land out connector
2010-08-21 00:29:27 +01:00
4463ebfbc2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:09:21 -07:00
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
86a61696d7
minor: remove mono compiler warning
2010-08-20 17:58:02 +01:00
bb5dd9fbbc
Some code cleanup for console command alert.
...
Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts.
2010-08-20 17:53:21 +01:00
a8c0b131f9
* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build
2010-08-17 13:50:04 -07:00
69ad04cdf6
Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.
2010-08-16 12:03:13 -07:00
77de28965a
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
2010-08-16 11:33:59 -07:00
a5044e08fb
Better comment (related to previous commit)
2010-08-15 18:13:09 -07:00
5d29c0ec9d
Addresses mantis #4929 . Agent was being logged off the grid too soon -- things may still fail.
2010-08-15 18:10:54 -07:00
1463691cb6
In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from libomv rather than little endian then swapping
...
This avoids a problem with failing to swap on big-endian machines.
This addresses http://opensimulator.org/mantis/view.php?id=4849
Thanks to Valy- for pointing this out and submitting a suggestion patch
2010-08-14 00:48:12 +01:00
8acb401a14
minor: remove mono compiler warnings
2010-08-13 23:28:28 +01:00
ab6dc47818
refactor: move binary statistics logging from scene into separate region module
2010-08-13 23:15:11 +01:00
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
9d84dfb687
minor: remove mono compiler warning
2010-08-13 21:44:44 +01:00
b30635a454
Establish new Objects/BuySellModule
...
Move Scene.ObjectSaleInfo() to this
2010-08-13 21:39:43 +01:00
5d20f04e08
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
2010-08-13 21:18:26 +01:00
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
39a748b47a
refactor: Use SOP.Flags rather than SOP.ObjectFlags
2010-08-13 20:23:53 +01:00
a299fa4849
This file wants to be committed
2010-08-10 11:18:39 -07:00
f216fd8136
Tests for distance-sorted fallback regions.
...
With some extensions to existing grid service tests.
2010-08-08 18:12:07 +01:00
a04efe4a4d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-07 05:39:20 +01:00
00fd2e0446
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:33:49 +01:00
59af886680
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:33:41 +01:00
2cedfba67c
Make the landmark properties work again
2010-08-07 05:33:21 +01:00
0090534793
Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
...
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
2010-08-06 17:43:09 -07:00
7e47ab746e
Allow creation of link regions if there is an existing region within a 4096 range.
...
Also add GetHyperlinks() to the grid service.
2010-08-06 17:02:03 -07:00
8d520f4525
Remove old test classes that don't actually test anything not done elsewhere
...
Also comment out log4net line in InventoryArchiverTests
2010-08-07 00:50:01 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
a133acbd5f
Merge branch 'iar-merge'
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
2010-08-04 20:56:52 +01:00
bda83715e4
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:46:30 +01:00
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
...
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
2010-08-03 17:09:20 +01:00
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
...
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
...
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
2010-08-03 15:45:49 +01:00
f84dbafb0c
remove gods event subscription to gods module from scene
2010-07-30 21:58:24 +01:00
424b4b2b86
move attachment subscription events into AttachmentsModule from scene.
...
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
2010-07-30 21:41:44 +01:00
f37ec933ae
store terrain module trying to load plugins if plugin path does not exist
2010-07-30 20:54:02 +01:00
c6bc1d28ec
move ChannelDigger from its own project into the main terrain module with the rest of the effects
2010-07-30 20:34:14 +01:00
5b80e3fc18
convert attachments module from old region module style to new
2010-07-30 19:26:54 +01:00
696b6c727f
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:20:40 +01:00
f067f733ea
add userExposed parameter to part copy event
2010-07-28 19:38:20 +01:00
0f15ccb2cf
relocate moap specific cloning code to MoapModule
2010-07-28 19:23:30 +01:00
5aa56b1274
Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart
...
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
2010-07-28 18:55:29 +01:00
b149d8970e
comment out verbose debug logging
2010-07-27 22:49:45 +01:00
30ac67fb3d
make MoapModule ignore possible future media texture data that it can't handle
2010-07-27 20:15:43 +01:00
ac542a907b
Make MoapModule ignore non-sl media texture data
2010-07-27 18:59:05 +01:00
4d23749241
provide config option for media on a prim
2010-07-26 23:34:23 +01:00
412fed975f
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
b51b2efdc8
Add EventManager.OnSceneObjectPreSave() for future use. This is triggered immediately before a copy of the group is persisted to storage
2010-07-26 23:34:22 +01:00
586ae0f6a0
Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage.
2010-07-26 23:34:22 +01:00
d764c95d09
also add avatar id to an updated media url - not just new ones
2010-07-26 23:34:22 +01:00
b06308e1d3
Properly set TextureEntry.MediaFlags when a media texture is set
...
Media flags is cleared via a direct TextureEntry update from the client. If the clearing leaves no media textures on the prim, then a CAP ObjectMediaUpdate is not received. If there are still media textures present then one is received.
This change fixes drag-and-drop on Windows (and Mac?) clients. It may also fix problems with clearing and then subsequently setting new media textures.
2010-07-26 23:34:22 +01:00
60c52ac0c4
start adding user ids to the media urls
2010-07-26 23:34:22 +01:00
cd985ab71b
Handle checking of line starting "*" wildcard for whitelist patterns
...
A line starting * can only be applied to the domain, not the path
2010-07-26 23:34:21 +01:00
664cbe2357
refactor: simplify current whitelist url checking by using System.Uri
2010-07-26 23:34:21 +01:00
0edabffb7d
Implement * end wildcard for whitelist urls
2010-07-26 23:34:21 +01:00
dce7307aa2
properly expose prim media LSL functions to scripts
...
scripts using these functions should now compile but I don't know how well the methods themselves work yet
llSetPrimMedia(), at least, appears to have problems when a current url is set for a face that doesn't yet have a texture
2010-07-26 23:34:21 +01:00
049ccba8d3
fix previous media interact serverside checking. perform very basic serverside url whitelist checks
...
at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work
2010-07-26 23:34:21 +01:00
cf7573c8fd
implement code to deregister users on DeregisterCaps
2010-07-26 23:34:21 +01:00
ee6cd884c9
implement serverside checks for media texture navigation in order to stop naughty clients
2010-07-26 23:34:21 +01:00
a9101feb10
factor out soon to be common media permissions check code
2010-07-26 23:34:20 +01:00
51b208e96c
implement prim media control permissions serverside in order to stop bad clients
2010-07-26 23:34:20 +01:00
e5615d3a9b
discard an object media update message if it tries to set more media textures than the prim has faces
2010-07-26 23:34:20 +01:00
eb5e39d6ef
Fire CHANGED_MEDIA event if a media texture is set or cleared
2010-07-26 23:34:20 +01:00
39a38c4901
implement llClearPrimMedia()
...
untested
2010-07-26 23:34:20 +01:00
d1a879927c
fix issue with GetMediaEntry if the face requested wasn't set to a media texture
2010-07-26 23:34:20 +01:00
43f480864b
fix problem persisting when only one face had a media texture
2010-07-26 23:34:20 +01:00
c76e2ce250
factor out common code for updating the media url
2010-07-26 23:34:19 +01:00
74bc4f61fd
factor out common face parameter checking code
2010-07-26 23:34:19 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
8f403cb4b8
Implement llGetPrimMediaParams()
...
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-26 23:34:19 +01:00
4ebae14a53
handle ObjectMediaNavigateMessage
...
Other avatars can now see the webpages that you're navigating to.
The requirement for an initial prim click before the texture displayed has gone away.
Flash (e.g. YouTube) appears to work fine.
Still not persisting any media data so this all disappears on server restart
2010-07-26 23:34:18 +01:00
468450a94d
send a full object update out to avatars when a media texture is initially set
...
this allows other avatars to see it, but still only after they've clicked on the face
still not handling navigation yet
2010-07-26 23:34:18 +01:00
4a6adff4cd
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-26 23:34:18 +01:00
c290cdd997
replace hand parsing of incoming object media messages with parsing code in libopenmetaverse
2010-07-26 23:34:18 +01:00
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
9301e36fbc
have a stab at sending the correct number of media entries to shapes
...
actually, this is probably wrong anyway if there's a default texture
it's going to be easier just to gather the object media updates and retain those in-memory now
but what the hell
2010-07-26 23:34:17 +01:00
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
2be7d0cdd4
Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.
...
Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out).
This is not yet persisted even in-memory, so no other avatars will see it yet.
2010-07-26 23:34:17 +01:00
ede446cad6
add stub media-on-a-prim (shared media) module
2010-07-26 23:34:17 +01:00
e46c0a0fc9
adjust DialogModule to only send broadcast alerts to root agents
2010-07-20 21:32:13 +01:00
e157dd630e
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:25:30 +01:00
466254105c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-14 23:04:25 +01:00
99a6950b30
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 23:29:04 +01:00
264f4f07cd
Detach attachments displaced by other attachments
2010-07-14 23:04:05 +01:00
8c10cb5ffe
improve closing of load/save iar streams in the event of a problem
2010-07-14 20:43:35 +01:00
e1ea82b329
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
a7b5fe6a88
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:49:54 +01:00
12858122d5
Fixes mantis #4870 .
2010-07-14 11:02:41 -07:00
0080c3b1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:13:04 +01:00
71433075a9
Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars
2010-07-14 17:12:12 +01:00
d64c09160c
Removed some more debug messages.
2010-07-14 04:18:13 -07:00
cd8bb316ea
Remove getting the object capacity from the money module. It is now set
...
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00
dd14016885
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
bed36901d1
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 20:37:12 +01:00
86f3f83250
uncomment a load iar code line I accidentally commented in the last commit
...
hooray for automated tests
2010-07-12 23:37:08 +01:00
3156f4bbeb
comment out a lot of the debug log messages when loading an iar
...
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
1169bfeaf3
Make taken items go back to the folder they came from
2010-07-10 10:43:34 +01:00
debc780654
Fixes additional bug reported in mantis #4841 .
2010-07-05 07:14:32 -07:00
b84f72df0b
Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids.
2010-07-04 14:59:15 -07:00
02a15bc787
Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory.
2010-07-04 13:56:03 -07:00
79c1eb1e39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-02 06:36:08 -07:00
490f1c144c
Fixes mantis #4782
2010-07-02 06:35:38 -07:00
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
8326f36cda
minor: comment out high volume texture serving module debug message
2010-06-30 22:07:28 +01:00
eb30b60e52
minor: comment out high volume texture serving module debug message
2010-06-30 19:54:35 +01:00
5925aac859
Add --merge switch to load iar.
...
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
d06b977ed1
Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure.
2010-06-29 14:21:48 -07:00
c607e6f3b8
Revert "don't report the null uuid as a missing asset on saving oars/iars"
...
This reverts commit 5ce119174e
2010-06-29 20:30:22 +01:00
08e3389790
Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
2010-06-29 04:38:15 -07:00
9fde9085a0
Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule.
2010-06-29 02:07:10 -07:00
d123350164
One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated.
2010-06-28 16:04:12 -07:00
0a82d10fc4
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 03:14:05 +01:00
a4a808818f
don't report the null uuid as a missing asset on saving oars/iars
2010-06-25 21:48:19 +01:00
854a8b9172
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 23:39:25 +01:00
24a68e36fb
Bug fix: wrong name of requester in local friendship offer.
2010-06-19 12:32:36 -07:00
71c8bbaf2c
Fix problem where iar load would duplicate huge number of folders
...
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
11a35d8cda
change TestPartExistingIarPath() to check appropriate folder creation
...
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
cf4721a92d
in IAR utils, return all folders that match a particular path rather than just the first one
2010-06-18 16:33:34 +01:00
19558f380a
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
2010-06-13 19:06:22 -07:00
66619b5996
Added checks for failed UpdateAgent calls.
2010-06-12 12:08:45 -07:00
e6efe34b4c
* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
...
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
4c58ac2c90
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:35:03 +01:00
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
2010-06-11 22:13:36 +01:00
694c8ab588
Remove the lastmap stuff from the map module, also remove a bunch of comments
...
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
...
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
7f349d61cb
Better friends notification: get rid of OnLogout and use OnClientClose for sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous.
2010-06-11 06:32:24 -07:00
2e1269e4ca
Bug fix on friends notifications. OnClientClose and OnLogout ordering are unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out.
2010-06-10 21:59:12 -07:00
e80cb815df
Bug fix on attachments: attach->drop->attach works now.
2010-06-09 12:51:24 -07:00
2a71df1285
Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory.
2010-06-09 12:22:25 -07:00
18bfe58de8
Bug fix on attachments: don't delete the item from inventory when it's dropped on the ground.
2010-06-09 11:24:37 -07:00
ca2abc43ad
Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
2010-06-08 16:44:18 -07:00
9b9804a498
* Changed CreatorIDs consistently to varchar(128)
...
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
ab3afd5f42
* Bug fix in TP home: typo in unpacking of GridUserInfo.
...
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
fe3e1c67ae
Bug fix: update the list of friends upon MakeRoot, because child agents don't get notified of new friendships.
2010-06-05 06:56:36 -07:00
63797445be
various refactorings on methods to replicate IAR paths to user inventory in order to improve readability
2010-06-05 00:48:33 +01:00
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
72bd68a21f
add ability for load iar/save iar to take in arbitrary options
...
not used for anything yet
2010-06-04 22:17:23 +01:00
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
df2bcf7b6b
remove pointless mock user account service since the real one can now be easily configured for test purposes
2010-06-04 20:56:24 +01:00
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
952029380a
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
2010-06-04 10:59:59 -07:00
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
191db0e6a4
get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears
2010-05-28 23:14:24 +01:00
a60ca5236c
restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService
2010-05-28 21:37:48 +01:00
505cb82dee
fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work
2010-05-28 21:14:15 +01:00
fff5459f4d
Add ability to load IARs directly from URIs
...
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
14c39461c2
minor: remove mono compiler warning
2010-05-28 19:41:13 +01:00
d72435693b
refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers
2010-05-28 19:21:00 +01:00
a48d7f62a7
Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
...
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
6b6425aa5e
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
c7c9edd049
minor: expand upon comments about not scheduling two full updates for attachments
2010-05-24 20:11:06 +01:00
f83acf533b
Fix a problem where SceneGraph.AddSceneObject() would return false on successfully adding an object rather than true, in defiance of its method documentation
...
This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added.
2010-05-21 21:22:53 +01:00
721c1085da
make oar object filename/pathname creation a helper method
...
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
78a0fd5281
Only send dialogs and notices to root agents, not child agents
2010-05-21 17:22:39 +01:00
13c22015e5
Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
2010-05-20 15:14:14 -07:00
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
59dec2f989
* Added sessionID to IGridUserService.SetLastPosition(), as some connectors will want to track position against sessionID instead of userID
...
* Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
2010-05-20 11:51:57 -07:00
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
98f2b798ff
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
2010-05-15 01:07:45 +01:00
3d72a73b22
Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
...
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:25:14 +01:00
4c740e1717
Implements three new OSSL functions for parcel management: osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
2010-05-13 14:22:48 -07:00
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
c1fe07b022
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
...
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
d72769930a
More cleaning on presence. Friends online/offline works again.
2010-05-08 07:44:07 -07:00
bfb7a49990
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
2010-05-07 21:56:14 -07:00
15562017f2
These files are part of the GridUserService write-up.
2010-05-07 21:32:02 -07:00
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
6182d71326
Also remove sale and search flags on god owner change.
2010-05-07 00:52:52 +01:00
907fce8406
Remove land that is being abandoned from search. This is now consistent with
...
sale and reclaim.
2010-05-07 00:50:26 +01:00
adc34c7129
Ensure the show in search flag is cleared on ownership change. Also, when
...
land is reclaimed, reset it's for sale flags so it can't be bought again right
away.
2010-05-06 16:07:15 +01:00
ebc3726d52
Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
...
(XmlRpcGroups files want to be committed too)
2010-05-05 16:54:48 -07:00
34d882b70d
Add perms check to the teleport home client command handlers.
2010-05-04 23:15:07 +01:00
3761f79971
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 21:26:10 +01:00
5a4cef6b36
make the events more useful by providing the source region
2010-05-04 18:55:24 +01:00
d997fc7b76
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 18:36:45 +01:00
6eea0a3931
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 15:52:36 +01:00
b10811a13b
Assorted bug fixes in hypergrid linking.
2010-05-03 09:50:55 -07:00
b836249926
* Untested Suggestion from lkalif to change
...
remoteClient.SendMapBlock(blocks, 0);
to
remoteClient.SendMapBlock(blocks, 2);
in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2010-05-02 20:44:34 -04:00
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
5fda81e6bb
* XInventory fairly tested, including for HG. Almost ready to switch.
...
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
da83ee28be
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
26e3884237
refactor: move DeatchObject() into the AttachmentsModule
2010-04-17 00:00:45 +01:00
57c293d604
refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule
2010-04-16 23:15:13 +01:00
45563e20e0
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
2010-04-16 22:57:44 +01:00
17d023ba5b
refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule
2010-04-16 22:54:25 +01:00
e9926d13cf
minor: use the static ascii and utf8 encodings instead of instantiating our own
2010-04-16 22:38:42 +01:00
bf3956aeb0
Add --skip-assets option to load oar.
...
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
3f6c4c150e
* Adds IAssetService.GetCached() to allow asset fetching from the local cache only
...
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
48d2e8309a
check group membership and powers with the groups module rather than just the client's active group id
...
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
2010-04-05 20:44:19 +01:00
cfa941adc7
Last commit was too fast... must override.
2010-04-03 12:14:57 -07:00
8f68edfe12
* Fail storing user accounts in the remote connector.
2010-04-03 12:11:54 -07:00
08ba34da03
First attempt at fixing mantis #4641 . It's better but there are now some issues with permissions.
...
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
21519d3311
Add missing licenses. Change relicensed LightShare module to proper BSD
...
licensing.
2010-03-31 13:33:18 +01:00
19ae5e5dbb
Adding the LightShare module and scripting API. This code was written by
...
TomMeta and was contributed by Meta7.
2010-03-31 04:23:51 +01:00
efc0916a01
May fix mantis #4613
2010-03-27 22:48:15 -07:00
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
f020bd3206
Fix a nullref in permissions when returning objects via right-click
2010-03-20 15:49:39 +00:00
5e65bef805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-19 15:17:15 -07:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +00:00
734b0416de
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:57:29 +00:00
73e9b0be72
Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
...
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00
b4dcdffb50
Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
2010-03-16 11:50:22 -07:00
45ef3e9987
Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen.
2010-03-15 20:32:36 -07:00
4e180e84e2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-15 15:38:55 -07:00
33f5d0d1e9
* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context
...
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
2010-03-15 14:17:17 -07:00
315fa06c75
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
2010-03-12 23:20:38 +00:00
582375509c
refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule
2010-03-12 22:48:49 +00:00
b9f5cd75bc
refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule
2010-03-12 22:39:15 +00:00
19b4770fe7
start laoding griduser local connector, though it isn't invoked by anything yet
2010-03-12 22:18:48 +00:00
f2de50bb14
Fix tests broken in 88771aeed3
...
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
2010-03-12 19:31:14 +00:00
04a6b1caf8
Reintroduce a check that was dropped from permissions
2010-03-10 05:31:34 +00:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
c5bb51b443
Changed a cryptic debug message and a wrong comment
2010-03-09 17:33:31 -08:00
dbb2edf1a6
Fixed caching of user accounts.
2010-03-09 17:09:44 -08:00
88771aeed3
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:11:28 +00:00
c7590bfd50
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-09 22:44:14 +00:00
98f91a252c
- parcel blocking, region crossing blocking, teleport blocking
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
4b8af2e1aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-09 12:19:11 -08:00
Diva Canto