596af3f600
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:12:21 +00:00
16a64c400b
* Makes forward and backward key reactions faster by responding to the NUDGE type movements.
2009-12-30 15:01:14 -05:00
2205d1c486
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-29 22:00:01 -05:00
25544ac04a
* Attempts to resolve the megaregion terrain edit rebound.
...
* It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue)
* While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good.
* This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good.
2009-12-29 21:59:19 -05:00
170a04ce41
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-29 17:21:37 -08:00
be2f033626
More renames to make everything consistent. This is the UserAccountService.
2009-12-29 17:21:16 -08:00
28516e2648
Fixed a couple of bugs that were bombing the data migration.
2009-12-29 16:51:59 -08:00
8f0d6d6b5c
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:37:28 +00:00
917fad40da
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:54 +00:00
6a4c578e5e
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:16 +00:00
88d2df597e
* Fixed names.
...
* Added configs for Standalone
* Changed UserSericeBase to use useraccounts instead of user
2009-12-29 16:34:02 -08:00
81bcedda83
Renamed user account modules to be consistent
2009-12-29 16:06:21 -08:00
b4483df270
* All modules and connectors for user account service are in place. Untested.
...
* Cleaned up a few things on presence connectors
2009-12-29 15:58:40 -08:00
a08360e3cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-30 00:27:34 +01:00
06f639b8f3
Fix a timer list locking issue causing XMREngine deadlocks
2009-12-30 00:27:01 +01:00
2294683f07
Tighten up the IUserService interface again. No need for auth tokens at this level.
2009-12-29 13:39:21 -08:00
6eb5754f5a
Polished the IUserService interface.
2009-12-29 13:27:21 -08:00
8631cea215
Change the interface a bit before someone depends on it's current form
2009-12-29 20:14:26 +00:00
ba3dfe4121
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-29 18:42:30 +00:00
67cfac0cf1
Merge branch 'master' into careminster
2009-12-29 18:41:45 +00:00
0b5cdc539c
Change teleports so the TeleportFlags are sent to the destination sim. It
...
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
2009-12-29 18:35:06 +00:00
18ca978b81
Give the new user tables the once-over. Strip the current set of methods
...
from IUserAccountService, we need to define what goes in there. Change
the handler to the generic handler. Adjust migrations, add index
2009-12-29 18:31:27 +00:00
e9df86a6d6
* Added useraccount table
2009-12-29 09:22:52 -08:00
a462e440d5
Better way of setting ServiceURLs
2009-12-29 08:06:07 -08:00
f40001f8ed
Added the ServiceURLs field to UserAccountData
2009-12-28 20:53:20 -08:00
3cb68d1c8b
Removed AccountType, GodLevel and UserFlags from UserAccountData. Doesn't belong there.
2009-12-28 20:37:21 -08:00
18d93c2cee
* Added Created field to UserAccountData
2009-12-28 20:29:52 -08:00
c164b85ea6
* Added packing/unpacking of the Home fields in PresenceInfo
...
* Cleaned up IUserService and beefed up UserAccoutData
2009-12-28 20:26:44 -08:00
3249d5be9a
Add the indices to really make this table work
2009-12-28 23:47:58 +00:00
c4f5ac970c
Add a migration to add the 3 new fields
2009-12-28 23:45:15 +00:00
e0fc854f05
Adding new fields and home location methid to presence. Adding cleanup
...
(deleting all but one presence record) on logout so that they don't pile up.
2009-12-28 23:42:08 +00:00
2ed207509b
Add the second step of the friends migration to pull data from the old table into the new
2009-12-28 19:12:33 +00:00
19a7a8f797
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-28 11:46:59 -08:00
43691e8270
Added some more log messages. This is beginning to work.
2009-12-28 11:46:34 -08:00
5b69f58aae
Make Migratons continue int he face of an error. This is required for the
...
friends migration, which MAY error out if the old friends table is not
in the same database as the new one being created. This error is nonfatal,
it would only mean that friends will not be migrated automatically. It would
bite people with nonstandard configurations.
2009-12-28 18:59:38 +00:00
397a296492
Add the migration for friends and guard the presence Report function
2009-12-28 18:52:24 +00:00
9a8f6c79c9
Forgot the migration file
2009-12-28 17:57:45 +00:00
92a40129b5
Database and presence changes. Untested
2009-12-28 17:34:42 +00:00
f43a648052
* Added the new modules to Resources, making them active.
...
* Added their configs to standalone for testing. This crashes, because the DB is still not ready.
2009-12-28 09:22:35 -08:00
531f998ed2
* Deleted HGPresenceBroker, since it won't be needed
...
* Linked the remote presence module to the corresponding remote connector
2009-12-28 07:16:43 -08:00
42122388ef
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 20:35:05 -08:00
3ef513e863
Presence remote connector and handler. Presence HG Broker. Nothing tested, just compiles.
2009-12-27 20:34:42 -08:00
3a953dfc98
This is somewhat major-like..... Change the intialization order of
...
Application plugins so that MainServer.Instance gets assigned before
RegionModulesController loads the new style shared modules. This
is needed because otherwise no new style shared module could
register a HTTP method.... if it breaks, you get to keep both pieces
2009-12-28 01:56:30 +00:00
eebddcd5e6
Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells.
2009-12-28 01:24:15 +00:00
b8dfccb227
Changed GetAgents to take string[] instead of UUID[]
2009-12-27 16:07:16 -08:00
0f5219a004
Allow lists to be embedded in query strings
2009-12-27 21:46:16 +00:00
2f717fc796
Remove the sesion from returned presence info
2009-12-27 18:03:59 +00:00
8ad8bd6282
Fix up the new Sirikata cient view
2009-12-27 17:52:27 +01:00
aa45262c3c
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:47:18 -08:00
49d6cfad2b
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:40:43 -08:00
Melanie