89f1ddb0a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 21:58:55 +01:00
5287c5f7fb
rearrange SceneGraph.AddSceneObject() to return earlier if an object with that uuid is already in the scene
...
this means that we don't perform pointless work
2010-05-21 21:57:56 +01:00
93ef65c690
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
...
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
2010-05-21 13:55:36 -07:00
4b518e0288
minor: remove LongRunning test designator from TestAddSceneObject() since it isn't, really
2010-05-21 21:48:47 +01:00
76135eec5b
add test to make sure that adding an object where one already exists in the scene with that uuid fails
2010-05-21 21:46:41 +01:00
8d968249ec
extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean
...
improve test to retrieve object by known uuid rather than dynamically assigned local id
2010-05-21 21:38:47 +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
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
4e23acb133
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-21 21:04:17 +01:00
2b5b2f4e60
Add a new priority scheme that works like FrontBack, but completely deprioritizes
...
static prims, creating a hierarchy as follows:
0 == own avatar < other avatars < pysical prims < static prims
For a child agent, simply acts like FrontBack
2010-05-21 21:02:26 +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
682efe9463
minor: refactor CreateAsset to eliminate dupe code
2010-05-21 19:41:00 +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
c0cb66e602
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:58:34 +01:00
1d6ab445ab
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:31:27 +01:00
ccbcf421e7
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:27:17 +01:00
a2e24377b4
Replace CSJ2K with fixed version (Mantis #3318 )
2010-05-21 15:26:04 +01:00
9f2d1e9294
* Made PriorityQueue non-generic so it natively understands EntityUpdate structs
...
* Replaced the per-avatar seen update tracking with update flag combining, to avoid overwriting full updates with terse updates
2010-05-20 23:53:27 -07:00
344f209565
Merge branch 'master' into careminster-presence-refactor
2010-05-21 06:28:13 +01:00
af5eeab7cf
Ensure that the first update sent out for any given prim is a full update
2010-05-21 07:37:55 +02:00
792e149c7e
Ensure that the first update sent out for any given prim is a full update
2010-05-21 05:13:31 +01:00
213e372253
Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form.
2010-05-20 20:24:50 -07:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
d28da5e5ce
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-21 03:41:32 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
ddd072b3fb
Merge branch '0.6.9-post-fixes' into careminster
2010-05-21 02:44:20 +01:00
147c2d6f80
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 02:31:14 +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
56f3cb6da0
* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unless we were asked to
2010-05-20 12:04:12 -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
859beaf830
Revert one of the previous patches' hunks. The new code looked better, but
...
was less efficient.
2010-05-20 11:03:38 +01:00
ce787a4c41
Series of patches to include creator ID in assets.
...
Contains a migration.
SQLite: May contain nuts.
The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db.
BasicAssetTest checks CreatorID storage, new test for weird CreatorID
(now also checks that non-GUID or empty CreatorID gets stored correctly)
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-20 11:01:51 +01:00
5532341bf9
Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo with kitto
2010-05-19 14:04:44 -07:00
6933b48a7e
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:49:34 -07:00
f77f9ecd8f
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:44:59 -07:00
d6a6668bd7
Scrambled asset type in BasicAssetTest.cs!
...
The asset type wasn't in the list of "DontScramble" fields,
so the test assets were stored with randomized type, which
caused exception on reading them.
Also the scrambler was moved from local var to the class level,
so it could be used in the new tests I've added (see the next commit).
2010-05-19 21:50:34 +03:00
64fe823b92
MySQLAssetData.cs now supports asset_flags, CreatorID
2010-05-19 21:50:32 +03:00
eacd8d0263
MySQL: added CreatorID, moved asset_flag to migration script
2010-05-19 21:50:30 +03:00
accf8c420d
SQLite: CreatorID added (and asset_flags moved) to the migration script
2010-05-19 21:49:30 +03:00
c6977cbd4d
Added CreatorID to SQLite asset data
2010-05-19 21:49:24 +03:00
ccee95552f
A bit of harmless refactoring in SQLiteAssetData.cs
2010-05-19 21:49:22 +03:00
d71c483bf0
Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case)
2010-05-19 21:49:20 +03:00
527a257b9f
Kind of fixed Melanie's "Exception(sql)" correction
...
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle. Also, there is a catch one level up,
so is this one necessary?
2010-05-19 21:49:18 +03:00
fc76b5f589
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:24:54 -07:00
71a95900fd
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-19 00:21:38 -07:00
ba36c62caa
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:20:51 -07:00
e4b8d76b10
Change appender to deal with line feeds more intelligently.
...
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
0c209a469b
Clean up output a bit
2010-05-19 03:48:03 +01:00
Justin Clark-Casey (justincc)