Diva Canto
1bd712c541
Reverting the [HG]MapModule to its buggy behavior above 4096. Ppl seem to prefer the color blue, and I have given up trying to make things work above 4096.
...
Revert "Improved reuse on the WorldMap/WorldMapModule.cs"
This reverts commit d473d9975e
.
2011-06-08 16:12:47 -07:00
Diva Canto
80fc607d75
Fixed "Unknown User" listed as creator/owner on prims created with the Build button by foreign visitors. Added command to the UserManagementModule to list all the known bindings between user UUIDs and their names: show user-names.
2011-06-08 16:01:33 -07:00
Diva Canto
9759b2a4bb
Added EventManager.OnPrimsLoaded, an event that modules can hook up onto so that they know when the scene's objects have been loaded from the DB.
2011-06-08 15:18:14 -07:00
Diva Canto
90f657d77d
Deleted wrong debug message.
2011-06-08 13:45:38 -07:00
Oren Hurvitz
61f1c2b2c5
Write estate errors on startup to the log
2011-06-07 20:20:04 -07:00
Oren Hurvitz
39323055bd
When a plugin fails to load because a DLL is missing, log which DLL it is
2011-06-07 20:17:49 -07:00
Diva Canto
eabfc9ca15
Added error message to help understand http://opensimulator.org/mantis/view.php?id=5527
2011-06-07 20:05:24 -07:00
Diva Canto
3307db5d4a
This hopefully fixes all issues with online/offline notifications across grids. http://opensimulator.org/mantis/view.php?id=5528
2011-06-07 19:36:04 -07:00
Diva Canto
02b40670be
This makes the display names work better for foreigners
2011-06-07 12:10:57 -07:00
Diva Canto
41627bdf8a
Remove scary error message
2011-06-07 12:09:32 -07:00
Diva Canto
f5d82350bb
This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
2011-06-07 10:51:12 -07:00
Diva Canto
1a23d322ac
More on the hunt for the slow down on HGFriendsModule. - Don't requests the online friends on foreign grids. If this works, there's another way of getting that info.
2011-06-06 19:52:50 -07:00
Diva Canto
dce0e46eaa
Moved the Mono Addins declaration of the HGFriendsModule to where the one for FriendModule is -- CoreModulePlugin.addin.xml (trying to hunt down the slowness reported by Nebadon related to HGFriends)
2011-06-06 18:20:02 -07:00
Diva Canto
e77ca65e57
This should make offline IMs work again. It should work for incoming foreign IMs where the local recipient is offline. I can't test any of this, because I don't run an offline IM server.
2011-06-06 17:46:34 -07:00
Diva Canto
6861606b6d
Narrow down the exception catching to exactly the exception of interest. This may decrease the time of processing prims with broken user data.
2011-06-05 19:46:29 -07:00
Justin Clark-Casey (justincc)
205b2f7ea4
Remove the unmaintained 'CMS' framework, which was really a 'source-control' experiment from 2008.
...
This hasn't been touched for about 2 years and I haven't being using it. If this is wrong then please let me know.
2011-06-04 03:01:52 +01:00
Justin Clark-Casey (justincc)
fe471b6424
Extend TestGiveInventoryFolder() to test giving back the freshly received folder
2011-06-04 02:44:53 +01:00
Justin Clark-Casey (justincc)
12b1cbf8bf
Fix give inventory tests to use different users rather than (accidentally) the same user. Extend TestGiveInventoryItem() to test giving back the same item.
2011-06-04 02:39:26 +01:00
Justin Clark-Casey (justincc)
fe890554fb
insert an InventoryArchiveUtils.FindItemsByPath() to return multiple items rather than just the first one
2011-06-04 01:37:01 +01:00
Justin Clark-Casey (justincc)
896f039513
create TestGetInventoryItem()
2011-06-04 00:51:49 +01:00
Justin Clark-Casey (justincc)
1543fd7fff
extend TestGiveInventoryFolder() to check for the receipt by user 2
2011-06-04 00:20:54 +01:00
Justin Clark-Casey (justincc)
66004a9375
If an llSensor() is in an attachment, make the detection cone face in the direction of the avatar, not the relative rotation of the attachment towards the avatar.
...
This is effectively a copy/paste from 459323a
, which should be refactored sometime.
This seems the obvious problem from field reports but I have not tested the fix myself. Feedback welcome.
2011-06-03 23:43:09 +01:00
Justin Clark-Casey (justincc)
d09210da86
minor: add in method print out to new test
2011-06-03 23:15:31 +01:00
Justin Clark-Casey (justincc)
527e10a04e
add stub UserInventoryTests.GiveInventoryFolder(). Not yet complete
2011-06-03 23:13:05 +01:00
Diva Canto
cf86ba5559
Added prefix HG to the name of the landmark item in inventory, as a soft reminder that the landmark belongs to a place in another grid. People can change the name, but that's their decision.
2011-06-03 11:48:24 -07:00
Diva Canto
623706d988
HG Landmarks bug fix: pull landmark asset data from user's asset server when user is traveling.
2011-06-03 11:33:44 -07:00
Diva Canto
fde3e704d3
oops
2011-06-03 10:50:55 -07:00
Diva Canto
e33cedfd42
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
Diva Canto
995b893e4c
HG Landmarks being created. WARNING: new config var under [HGInventoryAccessModule], Gatekeeper.
2011-06-03 09:04:34 -07:00
Diva Canto
76c60f1f99
Moved CreateNewInventoryItem to the InventoryAccessModule in preparation for supporting HG landmarks.
2011-06-03 08:27:01 -07:00
Diva Canto
2a12d143c2
HG IM: increase the timeout value
2011-06-02 10:44:10 -07:00
Diva Canto
6312eea459
HG IM bug fix: grid_instant_message was being placed in the default port instead of the specified one.
2011-06-02 10:14:26 -07:00
Diva Canto
65c71050cc
Extra debug message
2011-06-02 09:39:29 -07:00
Diva Canto
3c15c0b264
Added test IM client.
2011-06-02 09:39:09 -07:00
Diva Canto
4696a9c95e
Bug fix on HG IM.
2011-06-02 08:13:54 -07:00
Diva Canto
f2f30a7890
HG Friends bug fix: connector was shrinking principalID to UUID.
2011-06-02 07:26:40 -07:00
Diva Canto
c13acdf5a1
This is the better solution: make the combined key be only on the first 36 characters of each field -- that's the UUIDs. Thanks coyled. WARNING: Again, people who have gone through this migration and failed need to run it manually.
2011-06-01 20:19:22 -07:00
Diva Canto
43ecc46a22
It looks like there's a better solution for that problem.
...
Revert "Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually."
This reverts commit 3fa54a156a
.
2011-06-01 20:09:59 -07:00
Diva Canto
3fa54a156a
Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually.
2011-06-01 20:02:26 -07:00
Diva Canto
46cdd442a8
[Profiles] --> [Profile]
2011-06-01 18:18:31 -07:00
BlueWall
777f57d946
Re-Apply Use current TravelingAgent if the the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady""
...
This reverts commit 0a430bbffb
.
2011-06-01 18:47:06 -04:00
BlueWall
0a430bbffb
Revert "Use current TravelingAgent if the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady"
...
This reverts commit 4b9e446c62
.
2011-06-01 18:10:56 -04:00
BlueWall
ac4d080aaf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-01 17:01:40 -04:00
BlueWall
984b801dd9
Merge branch 'master' of /home/opensim/src/opensim
2011-06-01 17:01:08 -04:00
BlueWall
4b9e446c62
Use current TravelingAgent if the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady
2011-06-01 16:57:01 -04:00
Makopoppo
b0ed0e63dc
Adding boolean alias for commandline switches like -save_crashes=yes
2011-06-01 21:14:16 +01:00
Makopoppo
54096db30b
Fix: The command line switches 'save_crashes' and 'crash_dir' haven't actually worked
2011-06-01 21:06:43 +01:00
Chris Hart
5fb0455e92
Updates to MSSQL to most recent compatibility, also included Windlight support. Needs plenty of testing but clean install and migration from 0.6.9 have been tested and work, a few indexes still need to be added for performance.
2011-06-01 21:01:04 +01:00
Justin Clark-Casey (justincc)
a3e0895f12
a few minor formatting tweaks
2011-06-01 20:55:03 +01:00
James Stallings aka Hiro Protagonist
c43ad8a0e7
A final couple of tweaks to GroupsModule.cs. Remove unneeded delegate, and prettify codeing style/formatting
2011-06-01 20:51:52 +01:00
Justin Clark-Casey (justincc)
8bacf56e46
revert the prematurely included groups patch, yet again
2011-06-01 20:51:38 +01:00
BlueWall
929bdba346
Merge branch 'master' of /home/opensim/src/opensim
2011-06-01 13:47:38 -04:00
BlueWall
aed6e74080
Add alternate region handling for url based logins as found in login to "home" or "last"
2011-06-01 13:44:20 -04:00
Justin Clark-Casey (justincc)
5711ada5c9
Fix dumb sql mistake in MSSQLGenericTableHandler.Delete()
2011-05-31 22:42:18 +01:00
Justin Clark-Casey (justincc)
c67fa72d56
When sending an LLUDP MoneyBalanceReply message, fill out the transaction item description even though there is none.
...
This is to deal with a problem in libomv where calling ToBytes() without this crashes because of an ItemDescription.Lnegth dereference.
2011-05-31 19:57:08 +01:00
Justin Clark-Casey (justincc)
8129e64e2a
Fill in the new OwnerData field in the LLUDP ScriptDialog message.
...
If we don't do this then viewer 2.8 crashes.
Resolves http://opensimulator.org/mantis/view.php?id=5510
2011-05-31 19:25:01 +01:00
Justin Clark-Casey (justincc)
392d270264
revert the patch that accidentally got added in the last commit
2011-05-31 18:49:38 +01:00
Justin Clark-Casey (justincc)
c4b265aeae
update libomv libraries to 0.9.0
...
this is a prerequisite to fixing llDialog issues for the latest Linden viewers, since they are now making use of a new OwnerData field in the ScriptDialog message
2011-05-31 18:47:13 +01:00
Diva Canto
44371118a2
Made GetMapImage public in the Hyperlinker
2011-05-30 20:23:45 -07:00
Diva Canto
b81a304baa
Made the GatekeeperConnector a public property.
2011-05-30 20:12:05 -07:00
Diva Canto
e14b7ec9e1
HGWorldMap: don't send map blocks of hyperlinks that are farther than 4096 cells from the current region.
2011-05-30 17:19:46 -07:00
Diva Canto
d473d9975e
Improved reuse on the WorldMap/WorldMapModule.cs
2011-05-30 17:15:55 -07:00
Diva Canto
5cb7d8bc71
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-28 13:52:27 -07:00
Diva Canto
d5326197ac
Fixed an issue with the response of CreateAgent over the SimulationConnector.
2011-05-28 13:52:06 -07:00
BlueWall
3326e417b4
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 16:21:30 -04:00
BlueWall
c7e18f9017
Adding an event to signal that logins are enabled
...
Added an event to signal the eabling of logins and added an alert to send to a configured service.
2011-05-28 16:20:10 -04:00
BlueWall
d2c2a4301b
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 00:39:21 -04:00
BlueWall
99f42c0a6e
Add option to disable logins
...
This just covers script loading for now. More to come.
2011-05-28 00:35:06 -04:00
Justin Clark-Casey (justincc)
6f4a2685cf
minor: remove mono compiler warning
2011-05-27 23:43:31 +01:00
Justin Clark-Casey (justincc)
28cd03cda5
fix bug where generic sqlite table delete wasn't working.
...
this would have caused dupe links bugs when using the sqlite adaptor
2011-05-27 22:54:59 +01:00
Justin Clark-Casey (justincc)
b0c9696de0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-27 21:21:01 +01:00
Justin Clark-Casey (justincc)
e9988a3728
Make sure culture is en-US when saving archive related xml.
...
This might resolve http://opensimulator.org/mantis/view.php?id=5475
2011-05-27 21:19:20 +01:00
Diva Canto
fcef4688a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-27 13:07:39 -07:00
Diva Canto
76525be7b2
HG lures working! Friends can offer friends HG teleports via the profile. WARNING: additional configuration for HG inis -- see *Common.ini.example
2011-05-27 13:07:18 -07:00
Justin Clark-Casey (justincc)
4e4db749eb
If parsing fails in the primitive base shape (which prints out a debug log message), also print out the name and uuid of the part containing this shape.
...
This is to help in diagnosing parsing failures.
2011-05-27 20:59:35 +01:00
Justin Clark-Casey (justincc)
0af5bb239f
When saving an iar, don't chase down link asset IDs (since these points to other items rather than real assets)
...
This bug had no practical effect other than to make "save iar" misreport the number of missing assets
2011-05-27 19:39:03 +01:00
Diva Canto
4087a453dc
Avoid a scary warning message about null replies from the user agent service.
2011-05-27 08:53:26 -07:00
Diva Canto
d60f525baa
HG inventory transfers over the profile working.
2011-05-27 08:19:40 -07:00
Diva Canto
36f9d55c36
Added a BasicProfilemodule so that the profile-based actions (like give inventory, etc) work. This is just a mock profile, the same for all users, and with no DB backend behind it -- meaning that nothing will be saved. For serious profiles, use 3rd party implementations.
2011-05-27 07:00:36 -07:00
Diva Canto
0d29f73916
Commented a few extra debug messages.
2011-05-26 19:13:03 -07:00
Diva Canto
b17afe43c4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-26 15:52:34 -07:00
Diva Canto
0c58a9e680
HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service.
2011-05-26 10:04:48 -07:00
Justin Clark-Casey (justincc)
91ec1a572a
improve help information for "appearance show"
...
at the moment, this just performs a baked avatar check for everybody in the region. If the check returns 'corrupt' then a baked texture is missing and other avatars will continue to see the gas ball.
2011-05-26 02:48:47 +01:00
Justin Clark-Casey (justincc)
3270f4353e
Add --noassets option for "save iar"
...
Like "save oar", this saves an iar without assets
This can be useful for backup when you know the required assets will still be present (e.g. you're backing up the assets db separately).
This also bumps the iar format version to 0.3 and 1.2 respectively.
0.3 is backward compatible with previous opensim versions
1.2 is used if the --profile switch is specified. It is only compatible with 0.7.1 presently.
2011-05-26 02:22:52 +01:00
Justin Clark-Casey (justincc)
c7e46e8a51
Bump OAR file format version up to 0.7 for this development cycle.
...
This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time.
This addition is backward compatible with previous opensim releases
2011-05-26 01:37:15 +01:00
Justin Clark-Casey (justincc)
ab855e6f8d
fix bug where outfit folder links could not be deleted
2011-05-26 01:32:36 +01:00
Justin Clark-Casey (justincc)
d9889ae2e7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-26 01:28:48 +01:00
Justin Clark-Casey (justincc)
6f4d079fc5
Add a --noassets option to "save oar".
...
This switch stops any assets being saved in the oar.
This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available.
2011-05-26 01:27:01 +01:00
Diva Canto
587b17e23b
HG: Renamed, shuffled some interfaces around. Move them all to IHypergridServices.
2011-05-25 12:37:37 -07:00
Diva Canto
5c2168cae7
HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing.
2011-05-25 12:32:21 -07:00
Melanie
e398c33648
Add PayPrice to serialization format Xml2
2011-05-25 12:17:46 +01:00
BlueWall
ef3f6b4e63
Revert "Make client event handlers for money only work on root agents"
...
This reverts commit a8913141c0
.
Pulling this back until some testing under various money
modules can be done. Need to be able to make purchases as
a child agent.
2011-05-24 16:33:51 -04:00
BlueWall
a8913141c0
Make client event handlers for money only work on root agents
2011-05-24 16:07:48 -04:00
Diva Canto
e19031849e
Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.
2011-05-24 09:38:03 -07:00
Melanie
28c25d8477
Allow disabling the legacy backup mechanism to avoid the object clone if
...
backup is not used.
2011-05-24 04:03:51 +01:00
Diva Canto
24f28d3534
HG friends: Status notifications working. Also initial logins get the online friends in other grids.
2011-05-23 19:45:39 -07:00
Melanie
61d4291da5
Create a method to force the script engine to save state from outside
2011-05-24 03:17:12 +01:00
Melanie
178d541dca
Add an event for an orderly region shutdown that fires once per region before
...
the SceneGraph is torn down.
2011-05-24 01:19:48 +01:00
Melanie
24c00acedc
Fix Mantis #4429 : Allow llGiveInventory to work across sim borders.
2011-05-23 02:52:28 +01:00
Diva Canto
336665e035
More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
2011-05-22 16:51:03 -07:00
Diva Canto
fed3cc630e
File to be removed
2011-05-22 15:35:40 -07:00
BlueWall
dc95e38e42
Add stubs for unimplemented lsl functions
2011-05-22 14:59:18 -04:00
Diva Canto
58c53c41de
Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
2011-05-21 16:48:00 -07:00
Diva Canto
80457111e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-21 14:07:30 -07:00
Justin Clark-Casey (justincc)
bb9b317f15
Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead
2011-05-21 01:05:20 +01:00
Justin Clark-Casey (justincc)
4073f10133
rename test helpers enclosing package from Setup to Helpers
2011-05-21 00:51:34 +01:00
Justin Clark-Casey (justincc)
94553d4753
rename UserInventoryTestsUtils -> UserInventoryHelpers for consistency
2011-05-21 00:48:01 +01:00
Justin Clark-Casey (justincc)
156cc1418b
test helper rename for consistency
2011-05-21 00:44:58 +01:00
Justin Clark-Casey (justincc)
d7e5b76d73
refactor: rename AddSceneObjectItem to AddSceneObject
2011-05-21 00:39:42 +01:00
Justin Clark-Casey (justincc)
084059319c
refactor: move scene object item creation code into TaskInventoryHelpers
2011-05-21 00:37:20 +01:00
Justin Clark-Casey (justincc)
9103fe84d5
move test task inventory notecard item creation into a new TastInventoryHelpers class
2011-05-21 00:25:58 +01:00
Justin Clark-Casey (justincc)
0050bb438c
refactor: use SceneSetupHelpers.CreateSceneObject()
2011-05-21 00:15:22 +01:00
Justin Clark-Casey (justincc)
534ee52a12
rename UserProfileTestUtils to UserAccountHelpers to be consistent with other test helper names
2011-05-21 00:11:52 +01:00
Justin Clark-Casey (justincc)
3fed61a5d5
refactor: in TaskInventoryTests, use UserProfileTestUtils.CreateUserWithInvetory()
2011-05-21 00:07:24 +01:00
Justin Clark-Casey (justincc)
bc43cef581
minor: remove mono compiler warning
2011-05-21 00:05:00 +01:00
Justin Clark-Casey (justincc)
90567a9eaa
refactor Scene.RezObject() to use AddNewSceneObject() rather than copy/pasting code with small differences
2011-05-21 00:02:53 +01:00
Justin Clark-Casey (justincc)
f2095ea279
refactor TestRezObjectFromInventoryItem()
2011-05-20 23:45:39 +01:00
Justin Clark-Casey (justincc)
4b0fc4faef
implement Scene.GetSceneObjectGroup(string name) to match the equivalent GetSOP method
2011-05-20 23:41:14 +01:00
Justin Clark-Casey (justincc)
91a9f30b16
implement Scene.GetSceneObjectGroup(UUID fullID) using existing index
2011-05-20 23:34:34 +01:00
Justin Clark-Casey (justincc)
7ed419217f
add test for rezzing an object from a prim item
2011-05-20 23:22:27 +01:00
Justin Clark-Casey (justincc)
9fc29e1595
Implement llGetLinKNumberOfSides().
...
Based on code in http://opensimulator.org/mantis/view.php?id=5489 Thanks onesong.
2011-05-20 20:19:32 +01:00
Justin Clark-Casey (justincc)
6e7b588235
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-20 20:06:51 +01:00
Kim King
a2c19847b4
ScriptEngine/Shared: Fix bug 5473 (v2).
2011-05-20 20:00:55 +01:00
Diva Canto
d21e9c755f
HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
2011-05-19 16:54:46 -07:00
BlueWall
584bce36ac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-19 01:35:11 -04:00
BlueWall
926a100652
Add stub for llGetLinkNumberOfSides(integer link)
2011-05-19 01:34:11 -04:00
Justin Clark-Casey (justincc)
bdd7849094
Allow item links to be deleted even when other deletes and purges are disabled.
...
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved. When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
2011-05-19 00:51:14 +01:00
Justin Clark-Casey (justincc)
6dcc87b1ad
Accidentally committed too early
...
Revert "Allow item links to be deleted even when other deletes and purges are disabled."
This reverts commit 491279f99a
.
2011-05-18 00:23:35 +01:00
Justin Clark-Casey (justincc)
c562b9ef19
correct small mistake in "delete object name <name>" usage summary
2011-05-18 00:22:09 +01:00
Justin Clark-Casey (justincc)
491279f99a
Allow item links to be deleted even when other deletes and purges are disabled.
...
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved. When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
2011-05-17 22:31:16 +01:00
Justin Clark-Casey (justincc)
784f70f704
don't throw a null reference if an inventory link target doesn't exist when we're inspecting in order to send the required inventory folders
2011-05-17 02:25:05 +01:00
Justin Clark-Casey (justincc)
467d7060ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-17 01:58:51 +01:00
Justin Clark-Casey (justincc)
4232b1a89b
convert tabs to spaces
2011-05-17 01:57:18 +01:00
Kim King
901448a8eb
Fixup documentation for AutoBackupModule.
2011-05-17 01:55:54 +01:00
Diva Canto
a2f034c554
Changed yet more Warns to Debugs.
2011-05-14 13:36:55 -07:00
Diva Canto
be6feff331
Also changed a couple of messages in WebUtil from Wanr/Info to Debug.
2011-05-14 13:09:59 -07:00
Diva Canto
082a9ecd31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-14 12:57:34 -07:00
Diva Canto
a3aa839d75
Stop spamming Nebadon's console when assets aren't found in the asset server.
2011-05-14 12:56:50 -07:00
Justin Clark-Casey (justincc)
e3b8d42bbc
refactor: improve PrimLimitsModule to call ILandObject.GetSimulatorMaxPrimCount() rather than use copy/pasted code
2011-05-14 02:51:29 +01:00
Justin Clark-Casey (justincc)
340e3ccf16
refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() instance methods since it didn't make sense to use anything other than the instance themselves.
2011-05-14 02:42:47 +01:00
Justin Clark-Casey (justincc)
bef1ffa7db
simplify code in llGetParcelMaxPrims() to use existing code in LandObject rather than duping the algo
2011-05-14 02:34:46 +01:00
Justin Clark-Casey (justincc)
1d86079141
Correct llGetParcelMaxPrims() to use the same calculation as used elsewhere instead of the old 0.22 prims/meter squared fudge factor.
...
Thanks to tglion for this.
2011-05-14 01:26:04 +01:00
Justin Clark-Casey (justincc)
26ce1d27d0
Minor doc change to see if this provokes a good panda build
2011-05-14 01:07:06 +01:00
Oren Hurvitz
64d868fb64
When loading an OAR that doesn't have parcels, create a default parcel
2011-05-14 00:41:32 +01:00
SignpostMarv Martin
cb6cd3714e
The get_grid_info REST call now encodes XML Entities
2011-05-14 00:31:54 +01:00
Makopoppo
7a54638b57
Swapped the two restart command descriptions each other
2011-05-14 00:25:31 +01:00
Justin Clark-Casey (justincc)
5573fcfa93
Fix adding/removing/replacing outfits in viewer 2
...
To get this to work, I had to disable the dupe link check I put in a couple of commits ago.
When the viewer adds wearables to an existing outfit, it first requests deletes of all the existing links before creating a new set.
Since these messages are async, the creates were being received before the deletes had a chance to complete, resulting in missing current outfit links.
However, the dupe check shouldn't be as important now that broken links have been fixed - it was the broken links that were causing the client to create dupes.
Tested on kokua 0.1.0 WIP and SL 2.6.3. I now have no problems managing outfits on my standalone.
2011-05-14 00:10:27 +01:00
Melanie
59d8588ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-05-13 12:03:16 +01:00
Melanie
eceedba23b
Fix the cert validation handler so that it will not block other parts of
...
the server doing ssl successfully.
2011-05-13 12:02:49 +01:00
Diva Canto
e39dec6f37
Hopefully this fixes offline messages. The problem was: the server is not setting the ContentLength of the response. That comes up to OpenSim as ContentLength=-1, which made the existing test fail.
2011-05-12 20:48:24 -07:00
Diva Canto
1cc70df3b4
One more thing printed out. #OfflineIM
2011-05-12 20:20:08 -07:00
Diva Canto
84f2a779b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-12 19:57:15 -07:00
Diva Canto
301321c853
Instrument the heck out of offline messages. THIS IS VERY VERBOSE.
2011-05-12 19:56:59 -07:00
Justin Clark-Casey (justincc)
5f9edd195c
Fix broken inventory links on viewer 2.
...
It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s
2011-05-13 03:24:19 +01:00
Diva Canto
691283c44e
One more debug message for offline IMs.
2011-05-12 19:10:44 -07:00
Diva Canto
9e310a0c0f
Sequencing the using and try clauses as they were before, but this shows that that obsolete function is not catching 404's as it should...
2011-05-12 18:53:22 -07:00
Diva Canto
42bfab84b8
Bummer, can't print the data I wanted to see. Printing just the context.
2011-05-12 18:47:14 -07:00
Diva Canto
f54a36bd59
Tracking a problem with offline IMs coming in as null list.
2011-05-12 17:34:26 -07:00
Diva Canto
e9e4c009b4
This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil.
2011-05-11 20:44:03 -07:00
Justin Clark-Casey (justincc)
9988bff9e3
Add a smidgen of method doc about the fact that item links reuse the asset id item slot
2011-05-12 03:18:53 +01:00
Justin Clark-Casey (justincc)
ac12ace6f1
Prevent viewer 2 from creating a duplicate outfit inventory links.
...
I believe this is safe since there is a 1-1 correspondence between link item and worn item (i.e. you can't be wearing the same item at two spots simultaneously in one outfit).
This should stop lots of duplicate links being created when viewer 2 is used.
However, this doesn't prevent broken inventory links, which I believe is timing related since the effect is not consistent (e.g. keep relogging and the viewer should end up seeing them correctly) . I think we actually see this problem on viewer 1 as well.
It might be easier just to implement the Fetch*2 inventory caps which are documented at http://wiki.secondlife.com/wiki/Inventory_API . WebFetch* has been deprecated by Linden Lab since viewer 2.5.1 and according to the sl wiki, "has numerous bugs".
2011-05-12 02:46:13 +01:00
Diva Canto
7fa2489a6e
Revert "Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs."
...
This reverts commit 5548f83750
.
2011-05-11 13:15:27 -07:00
Diva Canto
af2e12d2b4
One more debug message. Don't use this unless your name is nebadon.
2011-05-11 10:43:50 -07:00
Diva Canto
5548f83750
Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs.
2011-05-11 10:21:42 -07:00
Diva Canto
47735468d2
Somewhat reverting the last commit. The viewer ignores 255's on tiles that were previously on, so we need to send 254 (offline) explicitly. Also removing the +/-4 for HGMap, because it makes the map flicker.
2011-05-10 09:02:25 -07:00
Diva Canto
e1a4a8d857
Changed the Access flag on HGMap to 255 (does not exist) and clarified the other value 254 too. Meanings taken from libomv.
2011-05-09 18:28:16 -07:00
Diva Canto
7e2b35bbb3
Fixes gray tiles around +/-4 when user clicks on an empty tile. Affects regions above 4096 primarily.
2011-05-09 11:35:41 -07:00
Diva Canto
8a5f6dc7a5
Fixes gray tiles on map search for viewers 1.
2011-05-09 10:25:42 -07:00
Diva Canto
c0a69bfaab
The map is seriously broken. This doesn't fix it, but at least provides one more piece of data that seems to be required -- agent flags, which seem to be different in Viewer 2. WARNING: changes IClientAPI.
2011-05-08 22:50:04 -07:00
Melanie
fd66903f74
Convert the prim count module into a permissionsmodule
2011-05-09 03:16:01 +01:00
E. Allen Soard
527b4e7c7e
Incremental - Just did some cleanup of comments and class name change to clean up from using BareBonesNonShared as a template.
2011-05-09 03:14:54 +01:00
E. Allen Soard
279ed08de1
Incremental patch to add config options to enable/disable the prim limits module to OpenSim.ini. EnforcePrimLimits is set to false by default to emulate the current behavior.
2011-05-09 03:14:48 +01:00
E. Allen Soard
65d595597d
Adds an optional module to enforce prim limits on a given parcel Takes into account acculmitive prim allowance when multiple parcels are owned by the same avatar on the same region. Does not handle prims that are moved by a script or account for temporary objects at the time of creation. other wise handles all tested cases including: Creating a new object from the build menu Moving an object from another parcel duplicating an object via shift move rezing an object from a script
2011-05-09 03:14:41 +01:00
Melanie
2b88d8f93f
Add commands to delete objects by name, UUID, creator or owner
2011-05-09 01:28:23 +01:00
Diva Canto
00f10c900a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-08 16:51:41 -07:00
Diva Canto
3a5e841b0b
Fix content-type to be application/x-www-form-urlencoded
2011-05-08 16:51:04 -07:00
Diva Canto
a650c74d23
Comment verbose debug message in GetTexture
2011-05-08 16:50:36 -07:00
Melanie
c8b9558039
Also compress the actual fatpacks
2011-05-08 23:52:31 +01:00
Melanie
e345f03895
Remove a spammy debug I left in. Disable TP cancel button at the point
...
of no return.
2011-05-08 22:05:33 +01:00
Melanie
1be67914fa
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-05-08 20:20:40 +01:00
Melanie
9688db2f68
Enable compressed (gzip) fatpack transfers.
2011-05-08 20:20:00 +01:00
Diva Canto
25809caaeb
Mantis #5472
2011-05-08 09:28:15 -07:00
Diva Canto
72fb0d5b93
Mantis #5470 -- add forgotten MSSQL's GridUserStore. Thank you MrMonkE
2011-05-07 14:56:59 -07:00
Justin Clark-Casey (justincc)
d4fcba08af
Add module with "appearance show" command.
...
At the moment, this command just asks the AvatarFactory to perform the existing baked texture check for each avatar in the simulator and returns "OK" or "corrupt".
This is for debugging purposes
2011-05-07 01:06:55 +01:00
Diva Canto
737add1683
Removed SimpleRegionInfo, which was obsolete and not used anywhere.
2011-05-06 17:02:46 -07:00
dahlia
eaa33cf478
adjust avatar terse update packet filter distance error threshold based on avatar speed
2011-05-06 16:56:54 -07:00
Justin Clark-Casey (justincc)
b140aef87a
refactor: simplify ConfigSettings
2011-05-06 22:51:36 +01:00
Justin Clark-Casey (justincc)
04ecd748d9
remove further mono compiler warnings
2011-05-06 22:47:41 +01:00
Justin Clark-Casey (justincc)
3d095e84d6
minor: remove mono compiler warnings
2011-05-06 22:45:03 +01:00
Justin Clark-Casey (justincc)
f5ec332474
remove obsolete [StandAlone] config section parsing, none of which was actually used since being superseded by the connector architecture in 0.7
2011-05-06 22:41:07 +01:00
Justin Clark-Casey (justincc)
913e6b70c6
minor: slightly shorten "show digest" printing code
2011-05-06 22:13:56 +01:00
Justin Clark-Casey (justincc)
621279e498
on asset "show digest" command, print out the asset type name (e.g. texture) as well as its number
2011-05-06 22:04:26 +01:00
Justin Clark-Casey (justincc)
9ff94a3a44
Say which filename an asset has been dumped to on a successful dump
2011-05-06 21:58:41 +01:00
Justin Clark-Casey (justincc)
2ef8e03773
Change command help text for "show capabilities" to "show caps", as this is the actual command that has to be typed on the console.
...
Thanks to makopoppo for the patch - http://opensimulator.org/mantis/view.php?id=5467
2011-05-06 21:21:02 +01:00
Justin Clark-Casey (justincc)
7c3e8a106b
Merge branch 'master' of https://github.com/allquixotic/opensim-autobackup
2011-05-06 20:51:55 +01:00
Diva Canto
74e981e796
One more bug fix concerning library items that weren't being copied to user's inventory. Also commented verbose debug message.
2011-05-06 09:56:27 -07:00
Diva Canto
50c0069f7d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-06 09:09:13 -07:00
Diva Canto
eafc01cf8f
Bug fix: iars under Library weren't being loaded.
2011-05-06 09:08:24 -07:00
BlueWall
68bb0f81e2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-05 20:07:19 -04:00
Justin Clark-Casey (justincc)
fd44540c02
add descriptive explanations for region restart functionality
2011-05-06 01:06:28 +01:00
BlueWall
e4e95706d5
Add support for llRequestSecureURL() if ssl is enabled
2011-05-05 19:57:10 -04:00
BlueWall
8ca7938753
Adding ssl support
...
Adding ssl support for "Out of Band" applications such as the remote
admin module or Robust services
2011-05-05 19:56:54 -04:00
Justin Clark-Casey (justincc)
8755a48cde
fix command display for debugging 'emergency-monitoring'
2011-05-06 00:34:04 +01:00
Justin Clark-Casey (justincc)
46baadbb65
remove the NDesk.Options using since didn't end up needing it
2011-05-06 00:22:19 +01:00
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
Melanie
f5bb6edd85
Squish a warning
2011-05-05 13:01:46 +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
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
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
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
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
Diva Canto
56df746133
XXX DEBUGGING!
2011-04-30 16:53:43 -07:00
Diva Canto
00e94b0ba8
Check for RegionID instead of RegionHandle. Other minor tweaks
2011-04-30 16:53:11 -07:00
Diva Canto
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
Diva Canto
c062138dad
Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all.
2011-04-30 12:23:40 -07:00
Diva Canto
3e79842312
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
Diva Canto
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
Melanie
99b35d3ca6
When coming in from a legacy region without fatpacks, start scripts the
...
usual way
2011-04-30 16:20:20 +01:00
Diva Canto
4d5d6222f7
Delaying starting the scripts on TPs and crossings until the agent is root.
2011-04-29 17:09:48 -07:00
Diva Canto
412503b216
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-29 15:52:40 -07:00
Diva Canto
0d49611f6d
Remove the scripts of the attachments in the departing region and recreate them if fail.
2011-04-29 15:52:06 -07:00
Dan Lake
8f14c3f04f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-29 15:49:49 -07:00
Dan Lake
d565041e16
Fix crash when [Mesh] section is missing from configuration files
2011-04-29 15:49:10 -07:00
Diva Canto
73caa4e94a
Minor correction to yesterday's changes. Make normal prim crossing (no attach) work well again.
2011-04-29 08:42:51 -07:00
Diva Canto
e462b926ac
Minor improvement in version checking (Simulation service)
2011-04-29 08:01:44 -07:00
Diva Canto
97790075fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 20:47:34 -07:00
Diva Canto
9892e115cc
Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
2011-04-28 20:19:54 -07:00
Justin Clark-Casey (justincc)
5e578c9755
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 23:43:42 +01:00
Justin Clark-Casey (justincc)
cd7517ccb9
Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
...
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
2011-04-28 22:59:12 +01:00
Diva Canto
35f190cc92
One less [Serializable] -- ClientInfo.
2011-04-28 09:06:57 -07:00
Diva Canto
549dc5aeb9
Eliminated sAgentCircuitData, a data structure that has been obsolete for quite some time.
2011-04-28 08:58:04 -07:00
Diva Canto
7ecf689584
Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to speed with 0.7.x.
2011-04-28 07:28:29 -07:00
Justin Clark-Casey (justincc)
50aa93137d
Fix a bug where physical objects rezzed with an initial velocity by script do not receive this velocity.
...
This is a minimal fix for the 0.7.1 release, pending a non copy/paste solution.
This hopefully addresses http://opensimulator.org/mantis/view.php?id=5457
The bug was introduced in commit 3ba5eeb
2011-04-28 00:59:21 +01:00
Diva Canto
e0576b56d3
Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples.
2011-04-27 07:02:37 -07:00
dahlia
16f6f55f2d
network traffic reduction - decrease update frequency for moving avatars when velocity is unchanged
2011-04-26 16:22:44 -07:00
Mic Bowman
1505fbb647
Add back the high prioritization for other avatars in the
...
BestAvatarResponsiveness prioritizer.
2011-04-26 08:54:05 -07:00
Sean McNamara
587aa91e36
Merge git://opensimulator.org/git/opensim
2011-04-26 11:45:38 -04:00
Mic Bowman
36fef21e52
Merge branch 'master' into queuetest
2011-04-26 08:42:21 -07:00
Sean McNamara
c82c7e6ed9
Wait for OnOarFileSaved event callback before executing script
...
We want to execute the (optional) user script after I/O is done on the oar.
I wasn't aware that ArchiveRegion is asynchronous -- now I am.
Should fully resolve comment 0018290 at
http://opensimulator.org/mantis/view.php?id=5440
2011-04-26 11:42:06 -04:00
Diva Canto
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
dahlia
037373b825
recover from unhandled exception from bad rotation data while processing entity updates in LLClientView.cs
2011-04-25 17:11:54 -07:00
Mic Bowman
b9bca893ef
Removed debug message in the token bucket code
2011-04-25 16:13:16 -07:00
Mic Bowman
13f141a4d5
Fix the totals shown by show throttle
2011-04-25 15:36:59 -07:00
Mic Bowman
b7eda288bf
Merge branch 'master' into queuetest
2011-04-25 15:12:53 -07:00
Mic Bowman
77ab7ce084
Fixed the transmission of throttles from root agent to child
...
agents. Child throttles are based on the number of child agents
known to the root and at least 1/4 of the throttle given to
the root.
2011-04-25 15:11:29 -07:00
Diva Canto
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
Mic Bowman
2fefb7adee
Merge branch 'master' into queuetest
2011-04-25 10:55:19 -07:00
Mic Bowman
024c12abc3
Cleaned up various configuration options. Removed the category throttle
...
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
Diva Canto
3a38bd8854
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
2011-04-25 08:53:48 -07:00
Mic Bowman
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
Diva Canto
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
Diva Canto
e3c3d626fb
Commented verbose debug message.
2011-04-24 16:14:24 -07:00
Sean McNamara
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
Sean McNamara
440d54a521
AutoBackup: Removed unneeded imports.
2011-04-23 18:32:08 -04:00
Sean McNamara
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
Mic Bowman
e2c6ed236d
Fix a bug looping through the priority queues. This should fix the problem
...
of not all prims being sent without reprioritization.
2011-04-23 12:17:10 -07:00
E. Allen Soard
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
Justin Clark-Casey (justincc)
d5256094d9
print invalid command message to the console, not the log
2011-04-23 00:16:55 +01:00
Mic Bowman
a3bd769cb3
Added a second immediate queue to be used for the BestAvatar policy
...
and currently used for all of an avatars attachments by the other
policies. Also changed the way items are pulled from the update queues
to bias close objects even more.
2011-04-22 14:55:23 -07:00
Mic Bowman
08e58e7ca6
Set the initial rate for the adaptive throttle to 160Kpbs
...
or about 15 packets per second.
2011-04-22 14:02:34 -07:00
Mic Bowman
3534f4492a
Various clean ups. Removed some debugging code. Added a new "show pqueues"
...
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
BlueWall
cbe49ed917
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-04-21 19:08:31 -04:00
BlueWall
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
BlueWall
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
Mic Bowman
0897647709
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
2011-04-21 15:41:15 -07:00
Mic Bowman
c5159ad8d0
Add some locking on the child list for the token bucket
...
hiearchy. A few other cosmetic changes.
2011-04-21 15:40:38 -07:00
Dan Lake
7f28dd4b31
Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and Removes in that order.
2011-04-21 15:40:32 -07:00
Melanie
398bb2149a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-04-21 23:04:01 +01:00
Melanie
13d6e05d5a
Implement agent limits
2011-04-21 23:03:38 +01:00
BlueWall
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
BlueWall
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
Justin Clark-Casey (justincc)
60685c3517
Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes.
2011-04-21 19:17:38 +01:00
Justin Clark-Casey (justincc)
e36cab99fd
minor: small amount of method doc and some commented out odds and ends
2011-04-21 18:45:05 +01:00
Justin Clark-Casey (justincc)
44999dce76
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 18:44:04 +01:00
Justin Clark-Casey (justincc)
63c1b7e475
Alter uuid gather so that it properly analyzes coalesced objects.
...
This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
2011-04-21 18:12:29 +01:00
Mic Bowman
371576d1dd
Merge branch 'master' into queuetest
2011-04-21 08:23:01 -07:00
Dan Lake
3640d0204f
Added ability to remove unacked packet from UnackedPacketCollection without an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case.
2011-04-21 01:51:08 -07:00
Dan Lake
b5ab33b5e1
bug fix. Now when an unacked update packet is handled through ResendPrimUpdates, it is removed from the UnackedPacketCollection.
2011-04-20 23:08:51 -07:00
Mic Bowman
7759bda833
Added an "immediate" queue to the priority queue. This is
...
per Melanie's very good suggestion. The immediate queue is
serviced completely before all others, making it a very good
place to put avatar updates & attachments.
Moved the priority queue out of the LLUDP directory and
into the framework. It is now a fairly general utility.
2011-04-20 21:58:49 -07:00
Mic Bowman
2b737c9cc2
Adds the first pass at an adaptive throttle to slow start new
...
clients. If the sent packets are ack'ed successfully the throttle
will open quickly up to the maximum specified by the client and/or
the sims client throttle.
This still needs a lot of adjustment to get the rates correct.
2011-04-20 16:23:33 -07:00
dahlia
212326eeb0
fix meshing failure on sculpt maps smaller than 64x64
2011-04-19 22:16:10 -07:00
Justin Clark-Casey (justincc)
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
Justin Clark-Casey (justincc)
2fa210243b
Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages.
2011-04-19 21:54:26 +01:00
Mic Bowman
82de87ce99
Converted the property request queue to use the same retransmission
...
mechanism as the entity update queues.
2011-04-19 11:22:04 -07:00
Dan Lake
08d8a3e580
Requeue unacknowledged entity updates rather than resend then "as is".
...
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.
Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-19 08:10:01 -07:00
Justin Clark-Casey (justincc)
36c4e94ef7
Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
...
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
2011-04-18 23:22:04 +01:00
Justin Clark-Casey (justincc)
f5a041d012
bump default IAR version to 0.2 and 1.1 for the --profile version.
...
There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
2011-04-18 23:00:41 +01:00
Justin Clark-Casey (justincc)
6109605038
bump oar version number to 0.6.
...
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18 22:42:36 +01:00
Justin Clark-Casey (justincc)
6600aa2baf
Add regression test to check that OARs start with the control file.
2011-04-18 22:35:33 +01:00
Justin Clark-Casey (justincc)
e00e518692
add test to ensure that an IAR starts with the control file
2011-04-18 22:24:42 +01:00
Justin Clark-Casey (justincc)
61619ddefc
refactor: split out the code which actually copies a particular bundle to inventory
2011-04-18 21:59:01 +01:00
Justin Clark-Casey (justincc)
71114d4ad1
refactor: rename DeleteToInventory() to CopyToInventory()
...
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
2011-04-18 21:34:26 +01:00
Justin Clark-Casey (justincc)
5a404a9ab1
Fix bug where objects were being coalesced in the wrong positions.
...
This addresses http://opensimulator.org/mantis/view.php?id=5441
The bug was due to a pre-existing mistake in creating the inventory stored position
2011-04-18 21:07:11 +01:00
Justin Clark-Casey (justincc)
8533c63d89
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-18 20:36:26 +01:00
Justin Clark-Casey (justincc)
419fc9427e
Provide a configuration setting to control whether multiple taken objects are coalesced to inventory
...
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
2011-04-18 20:03:53 +01:00
Mic Bowman
452ae375f0
Merge branch 'master' into test-merge0418
2011-04-18 11:29:43 -07:00
Melanie
03e725ad87
Mantis #5442 : Add admin_save_heightmap
2011-04-17 21:43:16 +01:00
Dan Lake
70084c5e3a
More descriptive debug msg for ServiceOSDRequest failures.
2011-04-16 15:29:28 -07:00
Mic Bowman
3e0e1057ac
Remove the call to remove tokens from the parent. Under heavy load
...
this appears to cause problems with the system timer resolution.
This caused a problem with tokens going into the root throttle as
bursts leading to some starvation.
Also changed EnqueueOutgoing to always queue a packet if there
are already packets in the queue. Ensures consistent ordering
of packet sends.
2011-04-15 16:44:53 -07:00
Diva Canto
cd6dce1108
Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't).
2011-04-15 16:42:40 -07:00
Justin Clark-Casey (justincc)
ed74be6599
Make remote admin error messages more helpful on windows.
...
Also, make log messages conform more with convention.
2011-04-15 23:54:30 +01:00
Justin Clark-Casey (justincc)
1dba671f45
refactor: separate out code that adds permissions
2011-04-15 23:32:46 +01:00
BlueWall
065d3f42c7
Merge branch 'master' of /home/opensim/lib/develop/BlueWall
2011-04-15 18:28:46 -04:00
BlueWall
fc365f2a31
Thanks Snoopy for a patch that allows setting of perms on items given to new avatars
2011-04-15 18:23:37 -04:00
Justin Clark-Casey (justincc)
9c7f14bf36
minor: remove a small amount of code duplication
2011-04-15 23:07:23 +01:00
Justin Clark-Casey (justincc)
98c5ed2c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-15 22:49:59 +01:00
Justin Clark-Casey (justincc)
52d9230392
refactor: split out some rez code into a separate CreateItemForObject() method
2011-04-15 22:47:47 +01:00
BlueWall
37d2b6243b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 21:16:30 -04:00
BlueWall
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
Justin Clark-Casey (justincc)
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc)
631654a38d
remove old code for a mock grid service, which got removed some time back
2011-04-15 01:30:49 +01:00
Justin Clark-Casey (justincc)
ba73df39a3
remove any reference to a mock authentication service since it doesn't exist and we don't use it
2011-04-15 01:26:07 +01:00
Justin Clark-Casey (justincc)
54e8855819
remove mock asset service for tests in favour of always using the real one
2011-04-15 01:23:26 +01:00
Justin Clark-Casey (justincc)
79bd430e08
Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin
2011-04-15 01:10:26 +01:00
Justin Clark-Casey (justincc)
ad70cddcfc
extend TestLoadCoalesecedItem() to check loaded object ids and positions
2011-04-15 00:56:40 +01:00
Justin Clark-Casey (justincc)
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
Justin Clark-Casey (justincc)
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
Justin Clark-Casey (justincc)
55387542ea
simplify InventoryArchiveTestCase setup
2011-04-14 20:35:00 +01:00
Justin Clark-Casey (justincc)
1569148b49
simplify TestSaveItemToIarV0_1()
2011-04-14 20:32:27 +01:00
Justin Clark-Casey (justincc)
e439264824
simplify TestRezObject()
2011-04-14 20:23:48 +01:00
Justin Clark-Casey (justincc)
c644ab6a2c
Make scene object parts created by the test utils unit sized.
2011-04-14 20:21:44 +01:00
Justin Clark-Casey (justincc)
4b05e667cb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 20:15:34 +01:00
Mic Bowman
22b307ea1c
Merge branch 'master' into queuetest
2011-04-14 11:59:25 -07:00
Justin Clark-Casey (justincc)
aaf9125869
simplify coalesced object tests by using existing scene object set up utils
...
this change makes it possible to set an absolute position on a group before it is put into a scene.
2011-04-14 17:33:55 +01:00
Mic Bowman
6ed6b46aad
Comment out the warning if the prioritizer runs without a fully
...
initialized scene presence. Not sure why we are dumping updates
to a client that isn't there yet...
2011-04-13 21:01:51 -07:00
Mic Bowman
590d20903c
Merge branch 'testmerge' into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
2011-04-13 15:41:17 -07:00
Mic Bowman
bf91d1b077
remove packet monitoring debugging code
2011-04-13 15:37:25 -07:00
Mic Bowman
b33aac737a
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-13 15:37:25 -07:00
Mic Bowman
5e7aba4f88
fixed a couple bugs with the property queues
2011-04-13 15:37:25 -07:00
Mic Bowman
3fe22126ca
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-13 15:37:25 -07:00
Mic Bowman
5b89c66c97
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-13 15:37:25 -07:00
Justin Clark-Casey (justincc)
c5465414b6
Use common coalesced serialization code for both tests and the InventoryAccessModule.
...
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
2011-04-13 22:55:26 +01:00
Justin Clark-Casey (justincc)
c81f5bfc5c
Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers.
...
Extend test to check position of objects in the rezzed coalescence.
2011-04-13 22:29:12 +01:00
BlueWall
c0fcc430fe
Merge branch 'master' of /home/git/repo/OpenSim into queuetest
2011-04-13 17:03:30 -04:00
Justin Clark-Casey (justincc)
68cc5b46fe
refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.
2011-04-13 21:48:16 +01:00
Justin Clark-Casey (justincc)
d8d28c3737
Fix bug where rezzing coalesced objects would give all objects the same name as the item.
...
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
2011-04-13 21:31:45 +01:00
Justin Clark-Casey (justincc)
58efd761d1
Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
...
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
2011-04-13 21:17:43 +01:00
BlueWall
dec9c2283b
Add ColladaMesh switch
2011-04-13 16:10:18 -04:00
Justin Clark-Casey (justincc)
08fd1d9bbd
factor out some test code into the SetUp()
2011-04-13 18:11:04 +01:00
Justin Clark-Casey (justincc)
6613daa82a
Add a regression test for rezzing a single object into a scene from user inventory
2011-04-13 17:46:36 +01:00
dahlia
90b810c27e
force mesh proxy for simple box prims with path cut
2011-04-12 22:47:30 -07:00
Diva Canto
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
Diva Canto
16c911dcbb
Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png.
2011-04-12 19:46:27 -07:00
Diva Canto
5c870fce54
Bug fix in object serialization -- sculpt data was wrong.
2011-04-12 19:45:33 -07:00
Mic Bowman
317617cfda
remove packet monitoring debugging code
2011-04-12 15:55:21 -07:00
Mic Bowman
80ba3de902
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-12 15:40:57 -07:00
Mic Bowman
7fa085b3fa
fixed a couple bugs with the property queues
2011-04-12 14:40:57 -07:00
Justin Clark-Casey (justincc)
da4a9653a2
minor: remove some mono compiler warnings
2011-04-12 22:33:06 +01:00
Justin Clark-Casey (justincc)
b0889ed92a
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
2011-04-12 22:30:43 +01:00
Justin Clark-Casey (justincc)
8e0d2cc43b
If an object is rezzed directly from a prim inventory then give it the rotation it was stored with.
2011-04-12 22:21:46 +01:00
Justin Clark-Casey (justincc)
3ba5eeb6c3
Allow a null rotation to be passed in to RezObject so that we can control whether to use the serialized rotation or not. Not used yet.
2011-04-12 22:15:40 +01:00
Mic Bowman
3afddb9033
Merge branch 'test-select' into queuetest
2011-04-12 12:39:02 -07:00
Mic Bowman
0e97629ee7
Merge branch 'master' into queuetest
2011-04-12 12:38:47 -07:00
Mic Bowman
095e602c4a
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-12 12:36:36 -07:00
Justin Clark-Casey (justincc)
98d7de22dc
Fix (add) ability to rez objects by dragging them out of another prim's inventory.
...
This should happen if the client supplies a task ID with the RezObject call.
The rez goes through the same code as llRezObject(), so the same perms are applied.
Rotation isn't yet preserved, this should be fixed shortly.
2011-04-12 18:31:41 +01:00
Sean McNamara
049bce4d00
Fixup the global defaults config parsing code.
2011-04-12 01:14:21 -04:00
Justin Clark-Casey (justincc)
621d5b58e1
minor: add a bit more method doc to IInventoryService.GetItem()
2011-04-11 23:56:04 +01:00
Justin Clark-Casey (justincc)
49d80f5711
Include code to return more information about the NullReferenceException seen in
...
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
2011-04-11 23:07:56 +01:00
Justin Clark-Casey (justincc)
64dc7e9f14
minor: remove now inaccurate comment
2011-04-11 22:35:07 +01:00
Justin Clark-Casey (justincc)
e8ecb2898c
minor: remove some mono compiler warnings
2011-04-11 22:33:24 +01:00
Justin Clark-Casey (justincc)
3a98fb080a
minor: adjust some spacing and indentation
2011-04-11 22:29:08 +01:00
E. Allen Soard
464fa45ec9
Implimented HTTP_VERIFY_CERT for llHttpRequest
2011-04-11 22:22:11 +01:00
Justin Clark-Casey (justincc)
0bd6bc8fba
create "config show" as a region console command synonym for "config get".
...
This is to create greater consistency with all the other show commands.
2011-04-11 21:59:26 +01:00
Justin Clark-Casey (justincc)
d6948b15c4
Make it more obvious when it happens that DLL plugin loading fails. Improve exception output on Windows.
2011-04-11 21:51:17 +01:00
Sean McNamara
95a6ee0a37
Fix NREs harder.
2011-04-11 13:20:46 -04:00
Sean McNamara
4ad05fb01d
Fix some NREs on certain paths.
2011-04-11 13:12:26 -04:00
Sean McNamara
4974a1ce69
AutoBackup: Support region-independent settings too.
2011-04-11 12:34:26 -04:00
Mic Bowman
6e9cdb9ce3
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-11 09:06:28 -07:00
Mic Bowman
72a24cf023
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/Prioritizer.cs
2011-04-11 08:41:36 -07:00
Mic Bowman
f778056c7a
Removed some priority queue debugging code
2011-04-11 08:37:43 -07:00
Mic Bowman
ebc249e3be
Changed the "not in scene" check in the prioritizier to just
...
a warning. There appears to be a race condition on slow logins
that attempts to prioritize before the scene presence is fully
initialized.
2011-04-10 17:02:40 -07:00
Mic Bowman
19c6d1d569
Split the priority queue class into a seperate file. LLClientView
...
is big enough.
2011-04-10 16:57:02 -07:00
Mic Bowman
83dc2470f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-10 16:57:02 -07:00
Mic Bowman
0bd06d8ba8
Fixed the prioritizer functions for the new priority queues
2011-04-10 16:57:02 -07:00