Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Robert Adams
270f7e653a
Add rotationalVelocity and acceleration to variables that are synced in PhysicsActor. Remove unused Prop class.
2011-01-27 11:05:26 -08:00
Robert Adams
8d87d9e42d
Add locking to prim and avatar lists to fix enumeration errors
2011-01-27 11:03:23 -08:00
Robert Adams
cfab010b10
Add IClientCore to RegionSyncAvatar to fix cast error on teleport
2011-01-27 11:01:48 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e33cb3db93
remove unused CreateBaseLand()
2011-01-27 16:50:41 +00:00
Melanie
b0f641fa15
Make it work
2011-01-27 06:41:07 +00:00
Melanie
17801bd78b
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 05:33:46 +00:00
Melanie
adb341e32f
Also set Godlike flag. Might be useful
2011-01-27 05:33:01 +00:00
Melanie
61b67b2ead
Add TeleportFlags.ViaRegionID to the flags sent on login when the region
...
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
Huaiyu (Kitty) Liu
85b7bb916f
Added some if condition in RegionSyncModule.SendSceneUpdates, so that if no updates to send, no thread is assigned to send updates.
2011-01-26 17:17:03 -08:00
Huaiyu (Kitty) Liu
441551e7c6
Commented out debug messages in enabling LinkObject synchronization.
2011-01-26 16:39:18 -08:00
Huaiyu (Kitty) Liu
101d67c45b
Enabled LinkObject to synchronize across actors.
2011-01-26 16:01:54 -08:00
Mic Bowman
2bab8e5538
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-26 13:35:21 -08:00
Mic Bowman
240c0eaf1d
Remove the RestorePresences functions (which don't seem to be doing
...
anything) and clean up the code in AddNewClient (so Appearance only
gets assigned once, not three times).
2011-01-26 13:33:34 -08:00
Justin Clark-Casey (justincc)
8eb2789ae1
Add some comments on ILandObject.StartPoint and EndPoint
2011-01-26 21:19:22 +00:00
Justin Clark-Casey (justincc)
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
Huaiyu (Kitty) Liu
4860eba0ba
In SceneGraph.LinkObjects, call RegionSyncModule.SendLinkObject before parentGroup.LinkToGroup is called,
...
so that the actors who receive LinkObject message will get it before the soft-delete messages of the linked-in
parts.
2011-01-26 11:54:51 -08:00
Mic Bowman
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
Huaiyu (Kitty) Liu
ea2dc04bac
Merge branch 'dev_kitty' into dev
2011-01-25 11:15:13 -08:00
Dan Lake
cf15fc0b97
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-01-24 20:03:20 -08:00
Huaiyu (Kitty) Liu
65c4889474
Added SceneObjectPart.UpdateCollisionSound w/o calling CollisionSound set function, so that
...
not to trigger aggregateScriptEvent if not necessary (so as not to change LastUpdatedTimeStamp and
LastUpdatedActorID to local actor if CollisionSound is not changed).
2011-01-24 17:20:16 -08:00
Huaiyu (Kitty) Liu
005c743fae
Added event SceneGraph.OnObjectCreateBySync, which will be triggered in AddSceneObjectByStateSynch.
...
ScriptEngineSyncModule now subscribes to this new event to create new script instances.
2011-01-24 16:25:33 -08:00
Melanie
b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00:00
Diva Canto
cc39d0bf4e
Fixes mantis #5343
2011-01-23 14:47:58 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
41105948bd
remove some mono compiler warnings
2011-01-21 23:19:52 +00:00
Justin Clark-Casey (justincc)
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
Justin Clark-Casey (justincc)
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
Justin Clark-Casey (justincc)
bf5ec8cb88
remove some mono compiler warnings and unnecessary dictionary instantiations
2011-01-21 22:51:52 +00:00
Justin Clark-Casey (justincc)
5f3f7c3405
minor: remove unnecessary newline from "show throttles" information
2011-01-21 22:48:49 +00:00
Justin Clark-Casey (justincc)
6ef7ea454c
Remove old 2 year unused linden stack region module shell
2011-01-21 22:48:04 +00:00
Justin Clark-Casey (justincc)
9971fdbcd5
properly format "show throttles" table
2011-01-21 22:31:46 +00:00
Robert Adams
3123671651
Configuration of PhysicsSyncServerAddress and port in regions file
2011-01-21 12:28:12 -08:00
Justin Clark-Casey (justincc)
38debbc59f
crudely refactor table generation code for "show queues" and "show throttles"
2011-01-21 00:56:37 +00:00
Justin Clark-Casey (justincc)
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
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
e39d2ab14f
Added DelinkFromGroupBySync and supporting functions to handle delink operations.
2011-01-20 15:58:48 -08:00
Justin Clark-Casey (justincc)
58eb6b5fa3
minor: help text adjustment for "show queues"
2011-01-20 23:22:45 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
1baf63dbae
Move "show queues" command out of OpenSim.cs and into a separate module.
2011-01-20 22:57:12 +00:00
Justin Clark-Casey (justincc)
f50780f4c2
remove unimplemented "show assets" command
2011-01-20 21:56:48 +00:00
Justin Clark-Casey (justincc)
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
Huaiyu (Kitty) Liu
67858f0dcd
Merge branch 'dev_kitty' into dev
2011-01-20 12:08:15 -08:00
Huaiyu (Kitty) Liu
43edf89a34
Changes names in Regions.ini, and added one more config item: SyncQuarkLocation.
2011-01-20 12:05:10 -08:00
Huaiyu (Kitty) Liu
a0eddfcf61
Added AddNewPart for synchronization of linked objects.
2011-01-19 17:34:28 -08:00
Huaiyu (Kitty) Liu
d874e4338f
Added softDelete parameter to SendDeleteObject in object synch.
2011-01-19 17:17:16 -08:00
Dan Lake
af07881a9f
Add asset ID to simian request URLs
2011-01-19 13:44:07 -08:00
Dan Lake
e9e36e2964
Merge branch 'prephysics' into dev
2011-01-19 13:06:28 -08:00
Dan Lake
7a1a21cd15
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-19 13:04:09 -08:00
Dan Lake
b02d3090b3
Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics
2011-01-19 13:02:50 -08:00
Dan Lake
f09f74c224
Patches to appearance and inter-region comms
2011-01-19 13:02:08 -08:00
Huaiyu (Kitty) Liu
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
Robert Adams
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
Justin Clark-Casey (justincc)
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
Justin Clark-Casey (justincc)
97c0430093
Downgrade and comment out some other caps messages for now
2011-01-19 01:10:09 +00:00
Robert Adams
c541b42f7e
Converted PhysicsActor identification from localID to UUID
2011-01-18 16:52:37 -08:00
Justin Clark-Casey (justincc)
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
Robert Adams
42563e77fa
Merge branch 'prephysics' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2011-01-18 09:31:33 -08:00
Melanie
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
Melanie
06e225bc0b
Also fix MySQLXInventoryData
2011-01-18 01:31:14 +00:00
Melanie
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
Diva Canto
f73c90c633
Put the 'new' back to avoid a warning. Yes, we want to hide it.
2011-01-17 17:52:03 -08:00
Diva Canto
a07375a7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 17:41:06 -08:00
Diva Canto
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
Melanie
75644e0f6e
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 01:26:42 +00:00
Melanie
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
Huaiyu (Kitty) Liu
c8dc14fb01
Configuration of SyncListenerIPAddress, SyncListenerPort, ServerIPAddress, and
...
ServerPort is moved to Regions.ini.
2011-01-17 17:13:15 -08:00
dahlia
624bf23abb
force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet
2011-01-17 16:39:53 -08:00
Justin Clark-Casey (justincc)
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
523628dca3
minor: remove mono compiler warnings
2011-01-18 00:14:58 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
6e58996b4d
refactor: remove redundant null checks
2011-01-17 23:57:50 +00:00
Justin Clark-Casey (justincc)
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
Diva Canto
37837850d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 13:12:46 -08:00
dahlia
aecaadd3bd
objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations
2011-01-17 13:10:09 -08:00
Diva Canto
4bcee1dfb4
Revert "DEBUG DEBUG DEBUG"
...
This reverts commit 59c2cd04ba
.
2011-01-17 13:07:02 -08:00
Diva Canto
59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
Diva Canto
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
Diva Canto
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
Diva Canto
0aeb8981b2
Brute force debug for XFF issue
2011-01-17 11:19:20 -08:00
Diva Canto
66f99ae267
More debug messages to help track the XFF header problem.
2011-01-17 11:03:46 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
69476339df
Merge branch 'prephysics_kitty' into prephysics
2011-01-14 09:56:43 -08:00
Melanie
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
Huaiyu (Kitty) Liu
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
BlueWall
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
Huaiyu (Kitty) Liu
c1e19ead74
Added ScheduleFullUpdate() in SceneObjectPart.AddInventoryItem(), to enable synchronization across actors.
2011-01-12 17:20:17 -08:00
Melanie
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
Melanie
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
Melanie
f75a3ee762
Use ToString() rather than a cast (more robust)
2011-01-12 21:25:51 +00:00
Melanie
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
Melanie
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00:00
Dan Lake
e7e2a62641
Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics
2011-01-11 19:19:44 -08:00
Dan Lake
039d919284
RefreshAppearance now tries to find the local avatar a few times before it gives up.
2011-01-11 19:19:15 -08:00
Huaiyu (Kitty) Liu
9e08ede0bd
Commented out DeleteAllSceneObjects in RegionSyncClient, and fixed a bug in "ssync stop".
2011-01-11 16:00:14 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
b5f1137a7d
Merge branch 'prephysics_kitty' into prephysics
2011-01-11 12:35:58 -08:00
Huaiyu (Kitty) Liu
b29e7c6e5e
Let RegionSyncModule to automatically start synchronization when all region loading is done.
2011-01-11 12:33:32 -08:00
Dan Lake
86235e200e
Merge branch 'prephysics' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into prephysics
2011-01-11 12:25:10 -08:00
Dan Lake
217b28195c
TEMP: Disable saving of appearance to Simian for demonstration purposed only.
2011-01-11 12:21:58 -08:00
Dan Lake
9d5888e0f6
Fixed typo in Region Sync Module debug message Log Headers.
2011-01-11 12:21:04 -08:00
Dan Lake
b5463e042c
Workaround for NaN in rotation update from PSA to CM.
2011-01-11 12:20:06 -08:00
Dan Lake
ed380196ea
Only AvatarFactory module should be calling ScenePresence.SendAppearanceToAllOtherAgents().
2011-01-11 11:49:05 -08:00
Dan Lake
6a24d0eb2d
Added missing lock in EventQueue Enqueue.
2011-01-11 11:40:14 -08:00
Huaiyu (Kitty) Liu
f8a0de591d
Handling RemovedObject as event, instead of as object-update as in the previous approach.
2011-01-10 16:30:42 -08:00
Huaiyu (Kitty) Liu
5c31e0bdd3
Enabled touch events (ObjectGrab, ObjectGrabbing, ObjectDeGrab) to be propagated to script engine and triggers script.
2011-01-10 14:14:40 -08:00
Diva Canto
e80bcc0049
Improved debug messages to track what is going on with the XFF header
2011-01-09 16:52:41 -08:00
Diva Canto
0fabe0e5a5
Added more debug messages under the -verbose option.
2011-01-08 16:33:33 -08:00
Diva Canto
35a2961ccd
Added a -v|verbose option to save iar.
2011-01-08 16:17:00 -08:00
Diva Canto
9d9a170571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-08 15:50:25 -08:00
Diva Canto
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
Mic Bowman
ec22560045
Merge branch 'cmickeyb'
2011-01-08 13:33:52 -08:00
Mic Bowman
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
Huaiyu (Kitty) Liu
7eb9affbd3
Enabled chats from scripted objects to be propogated to other objects and avatars.
2011-01-07 15:08:12 -08:00
Diva Canto
a1c5de0f94
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
2011-01-07 12:32:47 -08:00
Huaiyu (Kitty) Liu
4bb99b3df5
Merge branch 'dev_kitty' into prephysics
2011-01-07 12:02:22 -08:00
Huaiyu (Kitty) Liu
739bb1dc43
Fixed a bug in deserialization during rezzing objects out of inventory: SceneObjecPart.SyncInfoUpdate() fixed.
2011-01-07 12:00:00 -08:00
Diva Canto
02e661f8dd
Minor additional debug message.
2011-01-07 11:39:22 -08:00
Diva Canto
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
Dan Lake
4f45dcf711
Commenting out verbose debug in SceneGraph.cs
2011-01-07 11:37:03 -08:00
Diva Canto
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
Diva Canto
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
Dan Lake
9d7fd472c0
Fixed a problem with PhysEngineToSceneConnectorModule.cs disabling regionsync when physics syncing is disabled.
2011-01-07 08:27:06 -08:00
Dan Lake
046ec22924
Modified debug messages
2011-01-06 19:26:35 -08:00
Dan Lake
a7ec095063
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-06 17:56:18 -08:00
Robert Adams
ce4b095a1a
Merge branch 'physics' into dev
2011-01-06 17:43:41 -08:00
Diva Canto
32a3f330ed
Canonicalize URL endings for the UserAgentServiceConnector.
2011-01-06 17:42:16 -08:00
Dan Lake
17504fcccb
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-06 17:33:13 -08:00
Dan Lake
a339598bad
Added scene name to config options
2011-01-06 17:32:10 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
fda56618e1
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
2011-01-06 16:17:43 -08:00
Diva Canto
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
Diva Canto
21dedb573b
HG map tile fetch: handle cached images appropriately.
2011-01-06 12:48:28 -08:00
Diva Canto
5b43f9cac4
HG bug fix. Must wait for client's UDP contact before getting scene presence.
2011-01-06 12:47:13 -08:00
Huaiyu (Kitty) Liu
e4ab31e004
merged in Kitty's code on propogating events and handling remote events
2011-01-06 10:46:06 -08:00
Dan Lake
247bed199f
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-01-06 09:21:21 -08:00
Dan Lake
f2013d3c93
Updates for appearance and attachments
2011-01-06 09:20:59 -08:00
Robert Adams
2152a5ab7b
Merge branch 'dev' into physics
2011-01-05 16:49:28 -08:00
Robert Adams
9669aa93f8
Added region specification to configuration of SyncListenerIPAddress and SyncListenerPort
2011-01-05 16:45:08 -08:00
Huaiyu (Kitty) Liu
731a09bf95
Added symc sync handlers for event ScriptReset.
2011-01-05 16:39:53 -08:00
Robert Adams
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
Huaiyu (Kitty) Liu
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
Mic Bowman
d3ebf64369
Merge branch 'master' into cmickeyb
2011-01-05 15:01:53 -08:00
Mic Bowman
0b44e99730
comment out a couple simian debug messages
2011-01-05 14:51:11 -08:00
Mic Bowman
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
Huaiyu (Kitty) Liu
9b34d50643
Tried a temporary solution for propogating events across actors. See OnUpdateScript handlers.
2011-01-05 13:46:48 -08:00
Diva Canto
17ebe8fb77
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-05 07:14:45 -08:00
Diva Canto
0c165bc421
Commented a verbose Debug message in LLUDPServer that got uncommented at some point.
2011-01-05 07:14:09 -08:00
Robert Adams
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
Justin Clark-Casey (justincc)
4ac58093bf
Make the default for the very verbose XMLRPC groups debug setting false rather than true!
2011-01-04 23:23:42 +00:00
Huaiyu (Kitty) Liu
42645acab9
Fix a bug and link-set objects can now be synched correctly.
2011-01-04 14:19:44 -08:00
Diva Canto
fbde9b1136
Note to self: try to make only 3 things at the same time.
2011-01-04 11:33:15 -08:00
Diva Canto
db55859125
Guard against null Animator.
2011-01-04 11:30:08 -08:00
Robert Adams
7441fbfa3a
Merge branch 'dev' into physics
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
2011-01-04 10:28:26 -08:00
Robert Adams
0dbd96a12f
Modify remote physics configuration to work with new object sync. Remove some chatty debug messages
2011-01-04 10:19:21 -08:00
Huaiyu (Kitty) Liu
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
Mic Bowman
6a5d52b4c8
removed the early return on agentupdates, this was debugging code
2011-01-04 09:12:32 -08:00
Mic Bowman
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08:00
Mic Bowman
d3987024d7
Merge branch 'master' into cmickeyb
2011-01-03 17:05:24 -08:00
Robert Adams
7da71bd30d
Merge branch 'dev' into physics
2011-01-03 15:42:17 -08:00
Huaiyu (Kitty) Liu
f5df61162f
Added a missing file: IRegionSyncModule.cs.
2011-01-03 15:35:16 -08:00
Robert Adams
e68d9a25b1
Merge branch 'dev' into physics
2011-01-03 15:25:31 -08:00
Dan Lake
0b164072b3
Merge branch 'danmerge_symsync' into dev
2011-01-03 15:13:04 -08:00
Robert Adams
ae8f8d60a6
remove some load balancing routine invocations to eliminate build breaks. Remove chatty grab debug messages
2011-01-03 12:21:38 -08:00
Dan Lake
7bec1f71cf
Prevent position updates from being sent to remote simulation service.
2011-01-03 12:10:29 -08:00
Melanie
5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
Melanie
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
Melanie
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +00:00
Melanie
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
Melanie
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
Robert Adams
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
Dan Lake
a34e152e9b
Additional debug text in ScenePresence.cs for appearance
2011-01-03 09:37:31 -08:00
Robert Adams
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
Dan Lake
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
Dan Lake
adeab48e7e
Merge branch 'master' into danmerge
2011-01-02 18:38:58 -08:00
Dan Lake
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
Dan Lake
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
Mic Bowman
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
Melanie
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
Melanie
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
Huaiyu (Kitty) Liu
5acaba2974
Added basic implementation for ClientManagerSyncModule and PhysicsEngineSyncModule.
2010-12-29 17:01:45 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
Myan Thor
915c0b17b0
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
2010-12-29 06:03:43 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
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
Mic Bowman
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
Diva Canto
6386dfd362
No need for these methods to be virtual now.
2010-12-27 16:26:29 -08:00
Diva Canto
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
Mic Bowman
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00