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
Robert Adams