Justin Clark-Casey (justincc)
bc49a0bc5d
Add "dump asset" command to the asset service for debugging purposes.
...
This command dumps the asset with the given id to a file with the same name.
2011-05-06 00:09:08 +01:00
Dan Lake
9556e0079b
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2011-05-05 14:24:27 -07:00
Dan Lake
ee16ca551d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-05 13:21:29 -07:00
Huaiyu (Kitty) Liu
75c97acab8
Added a few "try, catch" phrases to help catch errors when sync'ing new objects or updating prim properties.
2011-05-05 12:23:37 -07:00
Huaiyu (Kitty) Liu
f5e648f54a
Added AddNewSceneObjectByRez, which when called, won't trigger RegionSyncModule.SyncNewObject.
...
The caller of AddNewSceneObjectByRez will trigger that later when all object properties have
been set.
Also, added calling aggregateScriptEventSubscriptions() after AddNewSceneObjectBySync(), so that
collision events in PhysActor, after it is created, are subscribed.
2011-05-05 10:22:16 -07:00
Melanie
1bdac6ed19
Fix up nant linux build break
2011-05-05 13:27:44 +01:00
Melanie
f5bb6edd85
Squish a warning
2011-05-05 13:01:46 +01:00
Melanie
4f588ad7ba
Fix up some paths in prebuild
2011-05-05 12:52:31 +01:00
Diva Canto
e8944d6c31
Test m_Enabled on RemoveRegion.
2011-05-04 20:40:25 -07:00
Diva Canto
6d34932775
Merge branch 'master' into caps
2011-05-04 20:30:33 -07:00
Huaiyu (Kitty) Liu
854cb58d6d
Revised SetSOPPropertyValue in RegionSyncModule.cs:
...
added calling aggregateScriptEventSubscriptions() after SOP.AggregateScriptEvents is set.
for properties AttachedAvatar and AttachmentPoint, do extra work besides copying the property values.
Propogation of colission event and attachment (attached after avatar login) both working now.
2011-05-04 14:36:18 -07:00
Diva Canto
6c503e75ac
Put the previous state back in the attachments in case the agent transfer fails.
2011-05-04 12:04:35 -07:00
Diva Canto
df7dacd004
Fixes mantis #5461 .
2011-05-04 11:34:18 -07:00
Diva Canto
a0f3b23065
Merge branch 'master' into caps
2011-05-04 07:31:32 -07:00
dahlia
4c59d57596
use getters instead of member variables in velocity network filter code and add some more descriptive comments.
2011-05-04 03:29:06 -07:00
dahlia
13ab00e45a
adjust terse avatar update filtering to send updates when distance traveled does not match expected distance, rather than at a fixed time period. this should smooth avatar motion somewhat when moving in a straight line and velocity is constant.
2011-05-03 19:47:50 -07:00
Huaiyu (Kitty) Liu
cd70c3ff56
Merge branch 'dev_perPropertyTS' into dev
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2011-05-03 16:55:23 -07:00
Huaiyu (Kitty) Liu
04d406a7c8
Added code to sync each SOP's LocalFlags property. Also, in DeselectPrim, feed the list of updated properties as FullUpdate,
...
instead of only the IsSelected property, since SOP's Name, Description and some other properties might just have been edited
by a user.
2011-05-03 14:48:14 -07:00
Huaiyu (Kitty) Liu
4afd3f6602
Commented out some debug messages.
2011-05-03 14:38:21 -07:00
Huaiyu (Kitty) Liu
4acd23f0f9
In SyncOutPrimUpdates(), calling UpdatePrimSyncInfoByLocal again before calling
...
SendPrimPropertyUpdates, to make sure local updates are sync'ed into
RegionSyncModule's cache.
2011-05-03 14:25:05 -07:00
Huaiyu (Kitty) Liu
eeb09f33e3
Add locking on m_primSyncInfoLock in InitPropertiesBySync and InitPropertiesSyncInfoFromOSDMap.
2011-05-03 13:54:59 -07:00
Huaiyu (Kitty) Liu
f8bf6c2cc4
Removed a few debug messages from previous commit, then the problem shows up again. It seems due to the script
...
engine, after rezzing the pebbles and changing their shapes, the cached values in RegionSyncModule not properly
sync'ed with SOP's data.
2011-05-03 13:37:55 -07:00
Huaiyu (Kitty) Liu
54ba7a61f8
Added back some debug messages, seems now shapes are sync'ed properly again.
2011-05-03 13:16:39 -07:00
Diva Canto
98b84802e4
Changed the defaults, so that it behaves exactly is it has been behaving (no WebFetch cap by default).
2011-05-02 20:19:36 -07:00
Diva Canto
ac9697edbe
Fixed: EventQueueGet and other caps were being wrongly deregistered. Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
2011-05-02 19:45:47 -07:00
Huaiyu (Kitty) Liu
c07c46c147
For debugging shape not sync'ed properly problem: adding back debug messages in
...
CompareHashedValue_UpdateByLocal
HandleUpdatedPrimProperties
2011-05-02 16:48:25 -07:00
Huaiyu (Kitty) Liu
7157398d77
For debugging shape not sync'ed properly problem: adding back debug messages in
...
CompareHashedValue_UpdateByLocal
SetSOPPropertyValue
2011-05-02 16:39:03 -07:00
Diva Canto
6b52c1d6cd
Fix the GetTexture path to /CAPS/GetTexture for now until we have real capabilities.
2011-05-02 16:16:10 -07:00
Huaiyu (Kitty) Liu
bceafb4291
removed a bunch of debug messages, which were added to debug why shape was not synchronizing properly.
2011-05-02 15:17:17 -07:00
Diva Canto
883f21dd02
WebFetchInventoryDescendents working. Tested with robust.
2011-05-02 14:33:34 -07:00
Diva Canto
2d403d5b18
Merge branch 'master' into caps
2011-05-02 11:56:51 -07:00
Diva Canto
aba9ffdbd0
Refactored the GetMesh module into a handler and a module, to be the same as GetTexture.
2011-05-02 11:56:40 -07:00
Diva Canto
f7d3720126
Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien avatar takes 6secs to transfer between sims on the same machine...
2011-05-02 09:20:08 -07:00
Diva Canto
51d0b8b4e9
Oops, forgot this one.
2011-05-02 09:06:21 -07:00
Diva Canto
8cc547c277
Turns out that it's a bad idea to let Agent position updates linger for a long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before.
2011-05-02 09:04:34 -07:00
Diva Canto
10180760b7
Works!
2011-05-02 08:48:55 -07:00
Sean McNamara
0995fedcac
AutoBackupModule: Implement per-region settings in Regions.ini.
2011-05-02 04:32:31 -04:00
Sean McNamara
fffd42f5cb
Merge git://opensimulator.org/git/opensim
2011-05-02 02:23:18 -04:00
Sean McNamara
2aab033aaa
First pass at fixing justincc's feedback v2 ( http://opensimulator.org/mantis/view.php?id=5440 )
...
Fixing everything here (I think) except the per-region config. That's next.
2011-05-02 02:20:50 -04:00
Diva Canto
2d21052fa3
Start to drill down on GetTexture. Read the config and do different things.
2011-05-01 19:09:08 -07:00
Diva Canto
f79400e94c
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
...
Renamed a few methods that were misnomers.
Compiles but doesn't work.
2011-05-01 18:22:53 -07:00
Diva Canto
275046cf02
Change GetTextureModule.cs to conform to the new IRegion module interface. NOTHING OF THIS WORKS. Compiles.
2011-05-01 12:03:00 -07:00
Diva Canto
126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
Diva Canto
f10666c7ba
How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.
2011-05-01 10:07:54 -07:00
Diva Canto
8cc9d22b89
Merge branch 'master' into caps
2011-05-01 09:31:26 -07:00
Diva Canto
bbe41c75e1
Fixed confusing OSDMap that comes as the response of QueryAccess in the case it fails.
2011-05-01 09:30:23 -07:00
Diva Canto
f0bf64b6de
Merge branch 'master' into caps
2011-05-01 09:11:16 -07:00
Diva Canto
6b2b036387
Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles.
2011-05-01 09:08:18 -07:00
Diva Canto
d4323dd753
Increased Timeout to 30 secs.
2011-04-30 18:08:48 -07:00
Diva Canto
91a604d4b6
Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because it was _way_ too low and is probably making writes abort in the middle.
2011-04-30 17:40:21 -07:00