b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00: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
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
41105948bd
remove some mono compiler warnings
2011-01-21 23:19:52 +00:00
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
bf5ec8cb88
remove some mono compiler warnings and unnecessary dictionary instantiations
2011-01-21 22:51:52 +00:00
5f3f7c3405
minor: remove unnecessary newline from "show throttles" information
2011-01-21 22:48:49 +00:00
6ef7ea454c
Remove old 2 year unused linden stack region module shell
2011-01-21 22:48:04 +00:00
9971fdbcd5
properly format "show throttles" table
2011-01-21 22:31:46 +00:00
3123671651
Configuration of PhysicsSyncServerAddress and port in regions file
2011-01-21 12:28:12 -08:00
38debbc59f
crudely refactor table generation code for "show queues" and "show throttles"
2011-01-21 00:56:37 +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
677889d3b6
Get rid of SymSync in OpenSim.ini, old way of object sync no longer works (via RegionSyncServer).
...
SyncListenerAddress/Port renamed as SyncServerAddress/Port.
2011-01-20 16:19:51 -08:00
e39d2ab14f
Added DelinkFromGroupBySync and supporting functions to handle delink operations.
2011-01-20 15:58:48 -08: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
f50780f4c2
remove unimplemented "show assets" command
2011-01-20 21:56:48 +00:00
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
67858f0dcd
Merge branch 'dev_kitty' into dev
2011-01-20 12:08:15 -08:00
43edf89a34
Changes names in Regions.ini, and added one more config item: SyncQuarkLocation.
2011-01-20 12:05:10 -08:00
a0eddfcf61
Added AddNewPart for synchronization of linked objects.
2011-01-19 17:34:28 -08:00
d874e4338f
Added softDelete parameter to SendDeleteObject in object synch.
2011-01-19 17:17:16 -08:00
af07881a9f
Add asset ID to simian request URLs
2011-01-19 13:44:07 -08:00
e9e36e2964
Merge branch 'prephysics' into dev
2011-01-19 13:06:28 -08:00
7a1a21cd15
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-19 13:04:09 -08:00
b02d3090b3
Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics
2011-01-19 13:02:50 -08:00
f09f74c224
Patches to appearance and inter-region comms
2011-01-19 13:02:08 -08:00
b3179d34da
reimplement SceneObjectGroup.UpdateObjectAllProperties to do parts updating differently, as
...
an attemp to make linkset updates correct, and rename the function UpdateObjectGroupBySync.
2011-01-19 10:52:06 -08:00
8256caad3f
Remove setting of localID on newly created avatar. This solves the case of later viewers in other regions not seeing position updates for other avatars.
2011-01-19 08:50:41 -08: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
c541b42f7e
Converted PhysicsActor identification from localID to UUID
2011-01-18 16:52:37 -08:00
7f000ea88e
Correct "show queues" to show queued packet numbers for each client instead of bytes.
...
Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are.
2011-01-19 00:33:25 +00:00
42563e77fa
Merge branch 'prephysics' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2011-01-18 09:31:33 -08:00
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
06e225bc0b
Also fix MySQLXInventoryData
2011-01-18 01:31:14 +00:00
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
f73c90c633
Put the 'new' back to avoid a warning. Yes, we want to hide it.
2011-01-17 17:52:03 -08:00
a07375a7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 17:41:06 -08:00
c98d1cffe2
Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
2011-01-17 17:40:48 -08:00
75644e0f6e
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 01:26:42 +00:00
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
c8dc14fb01
Configuration of SyncListenerIPAddress, SyncListenerPort, ServerIPAddress, and
...
ServerPort is moved to Regions.ini.
2011-01-17 17:13:15 -08:00
624bf23abb
force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet
2011-01-17 16:39:53 -08:00
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +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
523628dca3
minor: remove mono compiler warnings
2011-01-18 00:14:58 +00:00
8233ef25ba
Reduce amount of debug lopgging put out by some simiangrid connectors. Please re-enable if needed.
2011-01-18 00:10:34 +00:00
6e58996b4d
refactor: remove redundant null checks
2011-01-17 23:57:50 +00:00
81552099d6
Fix UnackedBytes client stack statistic as seen in "show queues"
...
Bytes were being wrongly added again on a resend
2011-01-17 23:45:25 +00:00
37837850d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 13:12:46 -08:00
aecaadd3bd
objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations
2011-01-17 13:10:09 -08:00
4bcee1dfb4
Revert "DEBUG DEBUG DEBUG"
...
This reverts commit 59c2cd04ba
2011-01-17 13:07:02 -08:00
59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
479d72ac97
Account for some component along the way lower-casing the HTTP header keys. (XFF header issue)
2011-01-17 11:37:39 -08:00
0aeb8981b2
Brute force debug for XFF issue
2011-01-17 11:19:20 -08:00
66f99ae267
More debug messages to help track the XFF header problem.
2011-01-17 11:03:46 -08:00
719f59db3f
Added code to propagate OnNewScript event, when client sends in RezScript request (e.g. add new script to a prim).
2011-01-14 16:58:06 -08:00
69476339df
Merge branch 'prephysics_kitty' into prephysics
2011-01-14 09:56:43 -08:00
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
0be2fe7f13
Changed the way RemoveObject is handled: now Scene.DeleteSceneObject() calls RegionSyncModule to
...
send RemovedObject message to other actors for synchronization.
2011-01-13 15:36:44 -08:00
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
c1e19ead74
Added ScheduleFullUpdate() in SceneObjectPart.AddInventoryItem(), to enable synchronization across actors.
2011-01-12 17:20:17 -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
f75a3ee762
Use ToString() rather than a cast (more robust)
2011-01-12 21:25:51 +00:00
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00:00
e7e2a62641
Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics
2011-01-11 19:19:44 -08:00
039d919284
RefreshAppearance now tries to find the local avatar a few times before it gives up.
2011-01-11 19:19:15 -08:00
9e08ede0bd
Commented out DeleteAllSceneObjects in RegionSyncClient, and fixed a bug in "ssync stop".
2011-01-11 16:00:14 -08:00
95be9c1f7d
Fixed a bug so that "ssync start" won't start new connections if a region is already synced.
2011-01-11 14:25:33 -08:00
b5f1137a7d
Merge branch 'prephysics_kitty' into prephysics
2011-01-11 12:35:58 -08:00
b29e7c6e5e
Let RegionSyncModule to automatically start synchronization when all region loading is done.
2011-01-11 12:33:32 -08:00
86235e200e
Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics
2011-01-11 12:25:10 -08:00
217b28195c
TEMP: Disable saving of appearance to Simian for demonstration purposed only.
2011-01-11 12:21:58 -08:00
9d5888e0f6
Fixed typo in Region Sync Module debug message Log Headers.
2011-01-11 12:21:04 -08:00
b5463e042c
Workaround for NaN in rotation update from PSA to CM.
2011-01-11 12:20:06 -08:00
ed380196ea
Only AvatarFactory module should be calling ScenePresence.SendAppearanceToAllOtherAgents().
2011-01-11 11:49:05 -08:00
6a24d0eb2d
Added missing lock in EventQueue Enqueue.
2011-01-11 11:40:14 -08:00
f8a0de591d
Handling RemovedObject as event, instead of as object-update as in the previous approach.
2011-01-10 16:30:42 -08:00
5c31e0bdd3
Enabled touch events (ObjectGrab, ObjectGrabbing, ObjectDeGrab) to be propagated to script engine and triggers script.
2011-01-10 14:14:40 -08:00
e80bcc0049
Improved debug messages to track what is going on with the XFF header
2011-01-09 16:52:41 -08: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
9d9a170571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-08 15:50:25 -08:00
eab0951a59
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
...
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
ec22560045
Merge branch 'cmickeyb'
2011-01-08 13:33:52 -08:00
df7fb207a8
Moved the map tile processing used by the Simian Grid
...
Frontend into a separate region module. Configuration
settings added to the defaults ini file. Others may find
this useful for pushing map tiles to a separate server.
2011-01-08 13:33:07 -08:00
7eb9affbd3
Enabled chats from scripted objects to be propogated to other objects and avatars.
2011-01-07 15:08:12 -08:00
a1c5de0f94
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
2011-01-07 12:32:47 -08:00
4bb99b3df5
Merge branch 'dev_kitty' into prephysics
2011-01-07 12:02:22 -08:00
739bb1dc43
Fixed a bug in deserialization during rezzing objects out of inventory: SceneObjecPart.SyncInfoUpdate() fixed.
2011-01-07 12:00: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
4f45dcf711
Commenting out verbose debug in SceneGraph.cs
2011-01-07 11:37:03 -08:00
c18bcf3d8d
A bit more frugal on the caller side of closing agents, now that the receiving end is async. No need for so much concurrency.
2011-01-07 10:25:49 -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
9d7fd472c0
Fixed a problem with PhysEngineToSceneConnectorModule.cs disabling regionsync when physics syncing is disabled.
2011-01-07 08:27:06 -08:00
046ec22924
Modified debug messages
2011-01-06 19:26:35 -08:00
a7ec095063
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-06 17:56:18 -08:00
ce4b095a1a
Merge branch 'physics' into dev
2011-01-06 17:43:41 -08:00
32a3f330ed
Canonicalize URL endings for the UserAgentServiceConnector.
2011-01-06 17:42:16 -08:00
17504fcccb
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-06 17:33:13 -08:00
a339598bad
Added scene name to config options
2011-01-06 17:32:10 -08:00
9ecf1c21aa
Enabled chats (avatar to avatar, avatar to object) to work under the new EventManager (Dan's old way of
...
propagating chats is disabled by not subscribing to OnChatFromClientRaw in RegionSyncClient and
not subscribing to OnChatFromClientRaw/OnChatFromClientRaw in RegionSyncClientView.
Also, fixed a few minor bugs:
1. GetRemoteSyncListenerInfo() in RegionSyncModule fixed.
2. ActorID sent out when an actor connects to ScenePersistence actor.
2011-01-06 17:02:46 -08:00
fda56618e1
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
2011-01-06 16:17:43 -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
21dedb573b
HG map tile fetch: handle cached images appropriately.
2011-01-06 12:48:28 -08:00
5b43f9cac4
HG bug fix. Must wait for client's UDP contact before getting scene presence.
2011-01-06 12:47:13 -08:00
e4ab31e004
merged in Kitty's code on propogating events and handling remote events
2011-01-06 10:46:06 -08:00
247bed199f
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-06 09:21:21 -08:00
f2013d3c93
Updates for appearance and attachments
2011-01-06 09:20:59 -08:00
2152a5ab7b
Merge branch 'dev' into physics
2011-01-05 16:49:28 -08:00
9669aa93f8
Added region specification to configuration of SyncListenerIPAddress and SyncListenerPort
2011-01-05 16:45:08 -08:00
731a09bf95
Added symc sync handlers for event ScriptReset.
2011-01-05 16:39:53 -08:00
251592e54a
Code cleanup for better exception processing when looking for a scenePresence when routing a physics event
2011-01-05 16:22:27 -08:00
837a77b24a
Abandoned the previous temporary solution of propogating events. Instead, rename legacy (Scene)EventManager
...
as EventManagerBase, and implement a new EventManager, to enable handling local/remote events differently.
Handlers for UpdateScript has been implemented as a sample case.
2011-01-05 15:32:43 -08:00
d3ebf64369
Merge branch 'master' into cmickeyb
2011-01-05 15:01:53 -08:00
0b44e99730
comment out a couple simian debug messages
2011-01-05 14:51:11 -08:00
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
9b34d50643
Tried a temporary solution for propogating events across actors. See OnUpdateScript handlers.
2011-01-05 13:46:48 -08:00
17ebe8fb77
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-05 07:14:45 -08:00
0c165bc421
Commented a verbose Debug message in LLUDPServer that got uncommented at some point.
2011-01-05 07:14:09 -08:00
254436e914
Cause PhysicsterseUpdate event to happen in the persistance actor when the attributes are changed by the physics actor
2011-01-04 16:15:55 -08:00
4ac58093bf
Make the default for the very verbose XMLRPC groups debug setting false rather than true!
2011-01-04 23:23:42 +00:00
42645acab9
Fix a bug and link-set objects can now be synched correctly.
2011-01-04 14:19:44 -08:00
fbde9b1136
Note to self: try to make only 3 things at the same time.
2011-01-04 11:33:15 -08:00
db55859125
Guard against null Animator.
2011-01-04 11:30:08 -08:00
7441fbfa3a
Merge branch 'dev' into physics
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
2011-01-04 10:28:26 -08:00
0dbd96a12f
Modify remote physics configuration to work with new object sync. Remove some chatty debug messages
2011-01-04 10:19:21 -08:00
d84e69fefe
Added SymSync in config file. If SymSync = true, then code in the old sync module (asym sync) that handle object updates
...
are disabled. Then we effectively have new ways (RegionSyncModule) of handle object updates, and old ways of handling
avatar updates working together.
2011-01-04 10:12:35 -08:00
6a5d52b4c8
removed the early return on agentupdates, this was debugging code
2011-01-04 09:12:32 -08:00
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08:00
d3987024d7
Merge branch 'master' into cmickeyb
2011-01-03 17:05:24 -08:00
7da71bd30d
Merge branch 'dev' into physics
2011-01-03 15:42:17 -08:00
f5df61162f
Added a missing file: IRegionSyncModule.cs.
2011-01-03 15:35:16 -08:00
e68d9a25b1
Merge branch 'dev' into physics
2011-01-03 15:25:31 -08:00
0b164072b3
Merge branch 'danmerge_symsync' into dev
2011-01-03 15:13:04 -08:00
ae8f8d60a6
remove some load balancing routine invocations to eliminate build breaks. Remove chatty grab debug messages
2011-01-03 12:21:38 -08:00
7bec1f71cf
Prevent position updates from being sent to remote simulation service.
2011-01-03 12:10:29 -08:00
5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +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
be2af26231
Merge branch 'dev' into physics
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-01-03 10:47:19 -08:00
a34e152e9b
Additional debug text in ScenePresence.cs for appearance
2011-01-03 09:37:31 -08:00
8aded5bdd0
Debug message in ODEPrim on object creation. Less restrictive on changed test when routing updates in ODEScene
2011-01-03 09:13:44 -08:00
f0c2fe6569
Fixed build problem from merge. Needed to add 2 new functions to RegionSyncAvatar.cs as part of IClientAPI interface.
2011-01-02 18:56:59 -08:00
adeab48e7e
Merge branch 'master' into danmerge
2011-01-02 18:38:58 -08:00
9df74cf726
The "show" command on scene does not ever seem to be called anywhere. Commenting out the implementation for now and everything still builds. Might be a patch for master or needs a way to call it.
2011-01-02 18:28:42 -08:00
a5c321a548
Added region name to RegionSync debug messages for cases when there are multiple regions being synced by a single simulator.
2011-01-02 18:27:45 -08:00
df5e4a1e5b
Standardize the way WebRequests are made in the SimulationServiceConnector. Added
...
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
5acaba2974
Added basic implementation for ClientManagerSyncModule and PhysicsEngineSyncModule.
2010-12-29 17:01:45 -08:00
2ce7d982fa
Added functions to sync terrain updates. Either script engine or Scene can update terrain
...
and the other will be updated.
2010-12-29 13:41:51 -08: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
915c0b17b0
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
2010-12-29 06:03:43 -08:00
994d70f9d8
Code good for script engine and Scene to sync on majority object operations:
...
e.g. script execution, editing objects, reloading
oar file on Scene (but terrian not updated correctly to the debugging viewer of script engine),
rezing objects by scripts, deleting objects.
2010-12-28 17:11:30 -08:00
821f80bf3f
Add funtions in RegionSyncModule and (Actor)SyncModules to correctly process SyncStop.
...
E.g. script engine will save script states and delete objects in local scene copy;
ScenePersistence still maintains object copies, though.
2010-12-28 15:58:16 -08:00
130915f669
Added functions to sync on RemoveObject event. Object can now be removed from either script-engine
...
or Scene and can be synced.
Problem: there is significant delay form when an object is removed on one actor, to the time it also
disappears from the viewer attaching to the other actor.
2010-12-28 14:54:40 -08:00
384895cbdd
Added synchronization functions to RegionSyncModule, Scene, SceneGraph, SceneObjectGroup and
...
SceneObjectPart: examples:
HandleAddOrUpdateObjectBySynchronization
QueueSceneObjectPartForUpdate
SceneObjectGroup.UpdateObjectAllProperties
SceneObjectPart.UpdateAllProperties
Now script engine and Scene can sync on script updating or Scene editing objects.
2010-12-28 12:09:17 -08:00
94ed69b1da
Update SimianGridServicesConnector to work more like
...
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
6386dfd362
No need for these methods to be virtual now.
2010-12-27 16:26:29 -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
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
f10059ccd9
1. Added ActorID to IDSGActorSyncModule and the modules that implements this interface.
...
2. Added LastUpdateTimeStamp and LastUpdateActorID to SceneObjectPart. Also added functions to
serialize and de-serialize the two new members.
2010-12-27 12:15:39 -08:00
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -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
e68a8f7710
Added handlers to SceneGraph.OnObjectCreate event in both ScenePersistenceSyncModule
...
and ScriptEngineSyncModule, so that they can apply actor specific operations once
an object is added to the local Scene.
2010-12-23 15:42:05 -08:00
d0b429c186
Added SymmetricSyncMessage.cs to git index.
...
Added ScriptEngineSyncModule.cs with basic implementation. Code now good for script engine
to initilaize local scene by synch'ing with ScenePersistence's copy.
Fixed a bug in SyncStart(), so that it won't read in remote listeners' config info every time
SyncStart() is called.
2010-12-23 14:36:02 -08:00
d63e3db533
Added event OnPostSceneCreation to OpenSim/Region/Framework/Scenes/EventManager.cs, and TriggerOnPostSceneCreation. Reason: to emulate what PostInitialise() used to do for IRegionsModules, which is no longer included in INonSharedRegionModule.
...
Added OnPostSceneCreation() in RegionSynModule.cs, to gain ActorType information from the
loaded Scene.ActorSyncModule. OpenSim, when configured as ScenePersistence, can start normally now.
2010-12-23 14:07:05 -08:00
650b0bfe54
1. Restored SceneObjectSerializer.SOGToXml2() as in opensim trunk (master), so that objects
...
are serialized properly.
2. Added code to pass ActorType from a particular ActorSyncModule to RegionSyncModule.
2010-12-23 14:06:33 -08:00
0a9a8cc680
Restored SceneObjectSerializer.SOGToXml2() as in opensim trunk (master).
2010-12-23 10:29:12 -08:00
d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05: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
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05: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
dc6964444e
Two SyncConnectors now exchange RegionName and Terrian (Scene and Scriptengine tested).
2010-12-22 16:56:34 -08:00
bdeeead120
Add physics actor taint setting after receiveing update values
2010-12-22 15:35:26 -08:00
f97fe18648
Code good for an actor (script engine tested) to connect to ScenePersistence for synchronization.
...
Need to work on data transmission along the connection as next step.
2010-12-22 11:41:31 -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
c1af982ff4
Added code to initiate listener or start connecting to remote listeners.
2010-12-21 17:15:30 -08: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
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
cb49cfe6c5
Added "[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]" to
...
SymmetricSync modules that implement INonSharedRegionModule. They now start running as a region is loaded.
2010-12-21 13:23:52 -08:00
a2ca47d7eb
Add parameter and code for AgentID to track bucket changes. Added ground collision so walking now works
2010-12-21 13:19:09 -08:00
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
e96625c8ca
Started to implement Symmetric Sync between all actors. Reserved all old code for asym-sync implemented.
...
Created a subdir, SymmetricSync/ under OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/. Newly
added files are kept here.
See SymmetricSyncDesign.pptx for the high level SW arch design. Available at \\jfea1pub303\PlanetLAB\vwi\sceneapi.
Added implementation of RegionSyncModule, SyncConnector, and ScenePersistenceSyncModule (this is ScenePersistence specific actions, e.g. message/event subscription).
2010-12-21 10:48:34 -08:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
e1c3650634
Remove chatty debug messages. Damp update value checking. Physics sync message logging.
2010-12-20 14:06:14 -08:00
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01: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
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
420aeb9b6a
remove debug statements. Pass terrain to physics engine
2010-12-15 15:05:40 -08:00
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
9d0339e8f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 16:04:46 -08:00
a4309578e2
Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
2010-12-14 16:04:28 -08:00
3643be1c97
Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents
2010-12-14 23:46:02 +00:00
92727ad596
minor: disable debug logging for previous test
2010-12-14 23:41:36 +00:00
8a5f9b91de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 23:39:21 +00:00
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
7c6bca1668
physics messages sync'ing both ways. Value change not happening
2010-12-14 15:31:00 -08:00
2b390f2436
Fixed issues with save and retrieve appearance from grid.
2010-12-14 15:06:31 -08:00
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
ff8ff773e7
Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag
2010-12-14 12:58:32 -08: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
4357288a94
More on mantis #5270
2010-12-14 11:24:23 -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
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00
4bdba0a487
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 21:36:08 -08:00
b41164b620
This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
2010-12-13 21:35:40 -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
d6803e6448
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 20:28:14 +00:00
a4588befb7
Changed logging level for message about failure to retrieve a map image from a linked region.
2010-12-13 22:00:34 +01:00
9a24c0b41c
Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
...
Configuration option AssetService in section [GridService] must be set to enable this functionality.
Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270 .
2010-12-13 21:20:48 +01:00
6b8d01d8c4
It turns out that the 1/2 sec burst for prims download is not a bug, but a feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid.
...
Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond."
This reverts commit 870bbcfc6c
2010-12-13 11:45:17 -08:00
fe6c655f70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 09:43:54 -08:00
870bbcfc6c
This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond.
2010-12-13 09:42:27 -08:00
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
4d16ecf889
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-11 17:07:08 -08:00
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
69538d14d4
More OSSL function name normalization, this time for osParcelSetDetails.
2010-12-11 11:41:45 +01:00
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
2010-12-10 23:32:50 -08:00
18b10fab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 23:16:47 -08:00
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08: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
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
2010-12-10 12:40:12 -08:00
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
6f37290f4c
Adjust hypergrid console commands to latest changes.
2010-12-10 17:48:45 +01:00
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
c7923338bc
Merge branch 'master' into danmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSim.exe.config
2010-12-09 15:49:40 -08:00
dc86adbd17
Fixing up Appearance handling in Region Sync modules and connectors.
2010-12-09 15:07:42 -08:00
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -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
a036426f18
PhysActor update messages working. Avatar and prim neither move nor position correctly
2010-12-08 17:19:06 -08:00
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
5c6f0878a1
Add interfaces for physEngine connectors
2010-12-06 10:58:54 -08:00
24bef963c7
Initial connection of phys actor
2010-12-06 10:57:39 -08: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
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +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
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +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
Melanie