56c176f0a3
minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter
2010-04-09 19:59:58 -07:00
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
08ba34da03
First attempt at fixing mantis #4641 . It's better but there are now some issues with permissions.
...
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
2bf1761ad8
When saving an oar/iar, don't attempt to write out the data byte array if it's empty
...
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
ec637e2b8c
Committing the LightShare code, which was developed by TomMeta of Meta7.
...
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
3e8cb7a9a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:21:24 -07:00
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
b4dcdffb50
Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
2010-03-16 11:50:22 -07:00
db61d66e74
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 17:58:25 +00:00
2313d14acb
minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked
2010-03-11 23:33:55 +00:00
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
98f91a252c
- parcel blocking, region crossing blocking, teleport blocking
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
d71ed7081b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-07 16:05:12 -08:00
3ecccbb77d
* Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
2010-03-07 16:03:15 -08:00
2e5f7ec926
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 20:05:33 +00:00
2dcf73dd93
- supporting llTextBox
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
f4c165afe7
Bug fix: store correct position information upon logout. Fixes mantis #4608
2010-03-06 08:21:54 -08:00
e39fc95659
Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
...
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
e07548d703
move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
2010-03-04 20:08:25 +00:00
60fde0c83a
minor: remove a couple of compiler warnings
2010-03-03 23:03:41 +00:00
61a63ff851
* Added three new helper utility files to OpenSim.Framework. MultipartForm is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams
2010-03-03 14:38:00 -08:00
13a8d11c46
Removing the sLLVector3 dinosaur
2010-03-03 12:12:32 -08:00
cfaf087b89
More work on GrantRights. Still not right.
2010-03-01 09:23:33 -08:00
38ea1dd5c8
Merge branch 'master' into presence-refactor
2010-03-01 01:01:32 +00:00
86c621fdc7
Change the signature of SendChangeUserRights, because we have to send
...
this to both parties
2010-02-28 22:56:31 +00:00
44e7224b86
Add missing ChangeUserRights packet sender
2010-02-28 22:47:31 +00:00
5c5966545d
Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there.
2010-02-28 12:07:38 -08:00
4aa37e995d
Remove the overlooked remnants of core profile support
2010-02-24 06:28:16 +00:00
df76e95aa2
Changed asset CreatorID to a string
2010-02-22 14:18:59 -08:00
71c6559a91
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-22 14:10:19 -08:00
7665aad002
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
2010-02-22 13:27:17 -08:00
e635570cf3
minor formatting tweak - try to trigger a build on panda
2010-02-22 02:13:01 -08:00
03706e3f08
add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive
2010-02-22 01:15:12 -08:00
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
bb171717ce
Deleted obsolete files in the Data layer. Compiles.
2010-02-21 15:38:52 -08:00
845a390e93
* Added a sanity check for missing asset data in LLClientView
...
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
2010-02-20 16:21:13 -08:00
842b68eeff
Change handling of the SYSTEMIP constant to be more sane.
...
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
92f8f3e9d2
Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia
...
This reverts commit c62a6adb2b
2010-02-18 03:31:06 +00:00
c62a6adb2b
change "SYSTEMIP" to "localhost" in the create region console command prompt
2010-02-17 19:56:30 -08:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
802a969267
Fix http://opensimulator.org/mantis/view.php?id=4224
...
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
35925942fc
Deleted unused class that came back because of merge conflicts.
2010-02-08 15:02:50 -08:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
3112b04c85
Changed an error message to w warning message.
2010-01-30 16:18:38 -08:00
5001f61c08
* HGGridConnector is no longer necessary.
...
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
0c81966c0a
Works for grid login.
2010-01-29 09:12:22 -08:00
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
7c00469cd2
Added ExternalName config on Gatekeeper.
2010-01-27 08:00:29 -08:00
910d2177ad
* .. More Endlines...
2010-01-26 12:49:53 -05:00
ccf7bfe09b
* a few more endlines..
2010-01-26 12:44:42 -05:00
19d4867af7
* Quick fix to Remote Console session ID handling.
2010-01-26 07:40:33 +11:00
c211a120a5
Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
5908b8ed7c
Change a member of the friendslist module to better reflect the client side
...
data storage paradigm of the friends list and avoid repeated, unneccessary
fetches of the entire friends list.
2010-01-19 11:33:42 +00:00
b2e6ec9e12
Agent gets there through the Gatekeeper, but still a few quirks to fix.
2010-01-17 18:04:55 -08:00
a7309d90da
* Added ServiceURLs to AgentCircuitData.
...
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
88d2adc93c
add an agent position field to AgentUpdateArgs for use by some non-LL clients
2010-01-14 02:16:40 -08:00
4de82891a9
Bug in Teleport fixed -- Appearance was missing from AgentCircuitData.
2010-01-13 09:34:08 -08:00
66920a9047
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
2010-01-12 09:22:58 -08:00
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
001d369568
CommunicationsManager deleted.
2010-01-11 07:45:47 -08:00
751e70af78
NetworkServersInfo removed from CommsManager.
2010-01-10 21:37:36 -08:00
cddd48aeea
Some more unnecessary things deleted in Framework.Communications.
2010-01-10 21:00:03 -08:00
dc4bbf6065
All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService.
2010-01-10 20:29:09 -08:00
0c2946031b
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
2010-01-10 19:42:36 -08:00
e966e51b89
Add a console_port setting to let the rest console use a different port
...
from the region server
2010-01-11 03:29:24 +00:00
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -08:00
68b7307f4f
Forgot to remove 'using'
2010-01-10 16:34:01 -08:00
53e83e5dbb
* Starting to clean the house...
...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
25fdbd6cbc
Less refs to UserProfileCacheService. Compiles but likely doesn't run.
2010-01-09 09:09:32 -08:00
332463ca94
Fix up the weird Lindenish "setaccess" message. Talk about strange....
2010-01-09 15:28:52 +00:00
063f106cbb
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
...
will be honored now, while allowed groups will not. This requires additional
groups module integration work
2010-01-09 14:17:44 +00:00
6b60f3cce5
A few more inches... Old friends things removed. Less references to UserProfileService.
2010-01-08 20:31:29 -08:00
c76c80a28a
Adds IClientAPI voids for GroupProposals.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-08 18:27:49 +00:00
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08:00
22b1ffdc6c
Fix repeated ArgumentOutOfRangeException when a local OpenSim console is resized under mono
...
May fix mantises 3186, 3270, 4022, 4238
2010-01-08 14:45:40 +00:00
17efecd6c5
Moving the new group data structures out of LLClientView into GroupData.
...
The new methods are still not in IClientAPI, so some work remains to be done.
2010-01-08 05:29:29 +00:00
f11a97f12d
* Finished SimulationServiceConnector
...
* Started rerouting calls to UserService.
* Compiles. May run.
2010-01-07 15:53:55 -08:00
b67470af91
Fixes the newly added packets as per Melanie's request.
...
Provisionally applied to fix the naming. Signatures are still subject to change.
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 15:09:13 +00:00
7f960cd595
Merge branch 'master' into presence-refactor
2010-01-04 21:41:33 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
872387d278
Merge branch 'master' into presence-refactor
2009-12-31 23:30:41 +00:00
004c751a1b
Whitespace cleanup (changed hard tabs to 4 spaces)
2009-12-31 21:36:04 +00:00
234d4e1105
Adds tons of packets.
...
Applied with change: Changed spelling to Summary (from Summery)
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:24:56 +00:00
f4efa325bb
More progress on both the Simulation service and the Login service. Both still unfinished.
2009-12-31 11:42:33 -08:00
a8901a40f4
Simulation handlers (agents & objects) completed.
2009-12-31 09:25:16 -08:00
b29ae72460
First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
2009-12-30 21:00:16 -08: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
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
c27aa3749c
Change in how the Library returns its descendant folders, so that it includes folders added after the initial load off the file system, by other mechanisms.
2009-12-23 11:45:39 -08:00
9c294c5663
- commented out unused method ConvertIHttpClientContextToOSHttp
2009-12-23 18:33:54 +01:00
e68c7a1f23
Add missing file
2009-12-22 05:08:15 +00:00
05e8b4e72c
Add a data path for error messages
...
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-22 04:55:43 +00:00
68187f7245
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
2009-12-21 07:44:17 -08:00
c0a8c2e707
Making the library read the item's flag, so that clothing items can have the proper icons.
2009-12-21 06:58:21 -08:00
87e9062862
Make sure that we catch and display any exceptions that get right to the top of our incoming http request handling stack
2009-12-15 16:34:27 +00:00
57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
ffff12f7c1
Change default grid and inventory service ports in ConfigSettings to the ROBUST default of 8003
2009-12-15 15:37:03 +00:00
963cf25813
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
...
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
d89f3e9811
Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:44:32 +00:00
83ca7db4b8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-12 04:14:12 +00:00
62ec60ca76
Getting rid of a bunch of old classes, that are likely left over from the ROBUST change.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:13:39 +00:00
d20fe7bfdd
A couple of more sanity guards, but this won't fix things when user profile fetching is borked.
2009-12-11 20:06:42 -08:00
5f0478c4c4
Fix to make [bad] tests happy.
2009-12-11 08:28:24 -08:00
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
4c61fcfc40
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
504bfd87d5
if an xml rpc method throws an exception, log as an error to the console as well as returning the exception to the caller
2009-12-03 18:05:42 +00:00
4234c64147
handle a condition where the http headers apparently have multiple remote ports designated
2009-12-02 04:10:53 -08:00
4af77e84b1
* Fix Inconsistent line ending style in Util
2009-12-01 10:21:22 -05:00
4338f4e1d7
* Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
...
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
251fd8c948
Apply patch to reduce git revision text length if running sim directly from a git tree
...
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
377bc27c1f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-26 19:02:41 +00:00
52dc9ec003
Bump trunk version number to 0.6.9.
...
This is a place holder name and not necessarily the version number that will be used
2009-11-26 19:00:57 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
05fc504ff3
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 12:16:42 +00:00
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
0561cf7d93
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
2009-11-20 03:12:36 -08:00
54b5677f23
remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a sculpty
2009-11-20 03:12:07 -08:00
7166f3748a
minor: correct error messages when queryfolder fails
2009-11-18 18:44:47 +00:00
47e482217e
minor: remove duplicate copyright notice in PollServiceWorkerThread
2009-11-18 16:28:00 +00:00
1afd347615
Correct formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive method
2009-11-17 23:17:50 -08:00
0712196c26
make logging less verbose when loading iars
2009-11-13 18:56:23 +00:00
89a63c9a8b
Some corrections to PrimitiveBaseShape.ToOmvPrimitive()
2009-11-13 01:18:52 -08:00
d95df603df
move fake user service to a separate mock user service class
...
delete asset cache tests shell
2009-11-12 19:33:38 +00:00
2f092d271e
Rename test services to mock services, since this is a more accurate description
...
remove duplicate mock inventory service
2009-11-12 18:44:03 +00:00
1fa037a0c3
minor: remove some mono compiler warnings
2009-11-11 15:56:14 +00:00
a8a01e2bc7
add a ToOmvPrimitive() method to PrimitiveBaseShape
2009-11-11 02:54:58 -08:00
5145dfa53c
* Removing the redundant SendPrimitiveTerseData.State field, it duplicates AttachPoint
...
* LLClientView.CreateImprovedTerseBlock() now uses AttachPoint and does the proper high-low swap (this should fix disappearing attachment pieces)
2009-11-09 17:13:56 -08:00
5300e8506d
Reintroduce AssetBase's old behavior. A Parameterless constructor is required
...
for .NET serialization and removing it breaks the OpenSim asset server
protocol.
2009-11-06 10:33:49 +00:00
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
83b4b4440b
Patch by revolution, thank you. Mantis #1789 . Implement friends permissions.
...
Applied with major changes. Core functionality commented pending review
for possible rights escalation. No user functionality yet.
2009-11-05 02:09:07 +00:00
c72f78215b
Backport the fixes to WebFetchInventoryDescendents to the UDP
...
InventoryDescendents packet. Testing has shown that UDP inventory now
works flawlessly and, unlike CAPS inventory, doesn't download the entire
agent inventory on start. Neither does it incessantly re-request folder
NULL_KEY. Therefore, I have disabled CAPS inventory.
2009-11-04 01:56:19 +00:00
865d3f4b09
minor: remove a few mono compiler warnings
2009-11-03 19:35:18 +00:00
fb08133999
* Remove the locklessqueue tests since I guess I didn't understand what it was when I wrote the test.
2009-10-30 19:24:14 -04:00
5101f688ee
* Add LocklessQueueTests. One Test is commented out because it fails. It should probably work.. but I'm awaiting clarification.
2009-10-30 19:13:57 -04:00
2e81acec48
* Adding Tests for OpenSim.Framework.Cache. Some test cases disabled until mantis resolutions.
2009-10-30 18:13:58 -04:00
4563f00852
* Another ACL Test
2009-10-30 17:27:44 -04:00
120c731a3b
* Moving A test from the OpenSim.Framework.ACL object to the OpenSim.Framework.Tests assembly. Fixing the test.
2009-10-30 17:04:10 -04:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
f89c2cac0f
Experimental test to rate limit the incoming packet handler and try to always leave a worker thread available for other tasks
2009-10-27 14:16:01 -07:00
c75d415648
* Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) to use a non-blocking parallel method when operating in async mode
...
* Minor code readability cleanup
2009-10-27 00:26:56 -07:00
0b1726b524
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 16:48:43 -07:00
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
ac7ccdf7d7
* Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later
...
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
2009-10-26 14:41:27 -07:00
730930955a
Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
...
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff
* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()
* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
52a4534f7f
* Change the way Util.FireAndForget() calls SmartThreadPool to avoid using a delegate (which STP appears to hold on to). This removes the slow leak I was seeing when using async_call_method=SmartThreadPool and stabilizes allocated memory for an idle OpenSim instance
2009-10-23 13:45:18 -07:00
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
36b0e5e1d3
Terrible typo in the previous commit!
2009-10-22 11:07:23 -07:00
6ca4b0f366
* Added a check if Util.m_ThreadPool is null before trying to use it, and if so initialize it to sane defaults
...
* Simplified the InitThreadPool() function
2009-10-22 10:37:11 -07:00
d756fa01ae
Add copyright header. Formatting cleanup.
2009-10-22 18:57:24 +09:00
2f394b7e7e
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)
...
* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 01:30:12 -07:00
1e71e3f910
Remove the "mel_t" from version string
2009-10-22 07:03:40 +01:00
b35fbe1f98
Merge branch 'melanie_test' into prioritization
...
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
2009-10-22 07:02:21 +01:00
32ccd5bb40
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget()
...
* Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-21 23:03:18 -07:00
8ce4fd7234
Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2
2009-10-22 04:02:26 +01:00
8a336c6860
Add MaxPoolThreads in startup to limit the size of the thread pool used
...
for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 02:28:53 +01:00
6492640e72
* Change the OnQueueEmpty signature to send the flags of the queues that are empty instead of firing once per empty queue
...
* Change the OnQueueEmpty firing to use a minimum time until next fire instead of a sleep
* Set OutgoingPacket.TickCount = 0 earlier to avoid extra resends when things are running slowly (inside a profiler, for example)
2009-10-21 18:03:41 -07:00
9ec55df988
Mark new version
2009-10-22 01:51:27 +01:00
2b39ff0a39
Merged master into prioritization
2009-10-21 16:24:17 -07:00
93b24b5207
Fix web map retrieval for regions configured via .ini
2009-10-21 03:44:40 +01:00
2a886fd76c
Really make module port selection work. Implement port setting in
...
LLProxyLoginModule.
2009-10-21 02:19:45 +01:00
8151190a45
* Removing ODEPrim and ODECharacter GetHashCode() overrides since they were based on something that could change
...
* Tweaked a few other GetHashCode() overrides to bring them in line with MSDN recommendations
2009-10-20 10:56:15 -07:00
9bc303d293
Add MainServer.GetHttpServer(port) method for using multiple listener
...
ports in region modules
2009-10-20 16:57:22 +01:00
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
bd03cbd815
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:19:37 -07:00
142008121e
* Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This avoids .NET remoting and a managed->unmanaged->managed jump. Overall, a night and day performance difference
...
* Initialize the LLClientView prim full update queue to the number of prims in the scene for a big performance boost
* Reordered some comparisons on hot code paths for a minor speed boost
* Removed an unnecessary call to the expensive DateTime.Now function (if you *have* to get the current time as opposed to Environment.TickCount, always use DateTime.UtcNow)
* Don't fire the queue empty callback for the Resend category
* Run the outgoing packet handler thread loop for each client synchronously. It seems like more time was being spent doing the execution asynchronously, and it made deadlocks very difficult to track down
* Rewrote some expensive math in LandObject.cs
* Optimized EntityManager to only lock on operations that need locking, and use TryGetValue() where possible
* Only update the attachment database when an object is attached or detached
* Other small misc. performance improvements
2009-10-19 15:19:09 -07:00
0a259caeef
Minor formatting cleanup.
2009-10-19 15:48:07 +09:00
233e16b99c
* Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away
...
* Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters
* Made Parallel.ProcessorCount public
* Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes()
* More cleanup of the ScenePresences vs. ClientManager nightmare
* ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
2009-10-18 20:24:20 -07:00
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
b4526a5a6d
* Big performance increase in loading prims from the region database with MySQL
...
* Handle the AgentFOV packet
* Bypass queuing and throttles for ping checks to make ping times more closely match network latency
* Only track reliable bytes in LLUDPCLient.BytesSinceLastACK
2009-10-18 02:00:42 -07:00
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
3a63de8d02
Added a description for RegionType
2009-10-17 15:55:30 -07:00
cdcbd22ba8
Merge branch 'master' into prioritization
2009-10-17 14:51:17 +01:00
c7da13eb23
Adds SendAvatarInterestsUpdate to IClientAPI
...
Thank you, Fly-Man
2009-10-17 14:50:21 +01:00
e5ccd3f793
Merge branch 'master' into prioritization
2009-10-17 14:34:48 +01:00
a95741cdd6
Re-rename ProductName back to it's original RegionType
2009-10-17 14:33:46 +01:00
077f473167
Merge branch 'master' into prioritization
2009-10-17 13:41:32 +01:00
72b96bcd84
Add ProductName to RegionInfo (for search)
2009-10-17 13:36:45 +01:00
80a8a9c4a7
Converted FireAndForget methods to use a singleton pattern to attempt to work around a Mono bug with nested delegates
2009-10-16 14:34:42 -07:00
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
df2d5a460f
Replaced the update lists with a priority queue implementation in LLClientView
...
Replaced the update lists with a priority queue implementation in LLClientView.
The priority queues are based on the MinHeap implementation also included in
this commit within the OpneSim.Framework namespace. Initially setup to exactly
mimic the behavior beofre the change which was a first come first serve queue.
2009-10-15 15:52:53 -07:00
82012ec4e3
* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow more tweaking in the future
2009-10-14 16:21:48 -07:00
1e9e9df0b3
* Switched to a plain lock for the ClientManager collections and protected the TryGetValues with try/catch instead of a lock
...
* Added ClientManager.ForEachSync() for operations that need to run synchronously, such as "show connections"
2009-10-14 14:25:58 -07:00
4135b0c4dc
* Split Task category into Task and State
...
* Crude prioritization hack
2009-10-13 19:45:38 -07:00
e8c1e69a0d
* Copied LocklessQueue.cs into OpenSim.Framework and added the .Count property and .Clear() method
...
* Changed the way the QueueEmpty callback is fired. It will be fired asynchronously as soon as an empty queue is detected (this can happen immediately following a dequeue), and will not be fired again until at least one packet is dequeued from that queue. This will give callbacks advanced notice of an empty queue and prevent callbacks from stacking up while the queue is empty
* Added LLUDPClient.IsConnected checks in several places to prevent unwanted network activity after a client disconnects
* Prevent LLClientView.Close() from being called twice every disconnect
* Removed the packet resend limit and improved the client timeout check
2009-10-13 18:56:54 -07:00
dc11643c00
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
...
* Added some missing implementations of IClientAPI.RemoteEndPoint
* Added a ClientManager.Remove(UUID) overload
* Removed a reference to a missing project from prebuild.xml
2009-10-13 17:33:45 -07:00
395a8680c3
* Fixed a bug where clients were being added to ClientManager twice
...
* Changed the ClientManager interface to reduce potential errors with duplicate or mismatched keys
* Added IClientAPI.RemoteEndPoint, which can (hopefully) eventually replace IClientAPI.CircuitCode
* Changed the order of operations during client shutdown
2009-10-13 16:53:19 -07:00
23a334b9f5
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
...
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
2009-10-13 14:50:03 -07:00
c893761319
* Unregister event handlers in LLUDPServer when a client logs out and disconnects
...
* Move ViewerEffect handling to Scene.PacketHandlers
* Removing the unused CloseAllAgents function
* Trimming ClientManager down. This class needs to be reworked to keep LLUDP circuit codes from intruding into the abstract OpenSim core code
2009-10-13 12:50:59 -07:00
170d2c4660
Merge branch 'master' into htb-throttle
2009-10-12 15:25:42 +01:00
8030ed89b0
Use Util.UTF8 instead of creating a new heap object every time.
2009-10-10 06:35:31 -07:00
5e6e31591c
Merge branch 'master' into htb-throttle
...
This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.
2009-10-10 10:26:47 +01:00
f29bd8036d
A slight improvement on name fetching -- using the local name cache, since it exists.
2009-10-09 14:36:08 -07:00
c146f2c8c4
Use the cache, Luke!
2009-10-09 13:49:55 -07:00
527c94825b
Merge branch 'master' into htb-throttle
2009-10-09 17:23:18 +01:00
1c220e173c
Adding a hair item to the default wearables, fixes newly created avatars appearing as a cloud
2009-10-09 17:22:02 +01:00
494a1e922d
Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet
2009-10-09 02:10:53 -07:00
1eb390beda
Remove ThreadTrackerTest. It's no longer relevant because the thread
...
tracker now uses the system thread list
2009-10-08 08:32:34 +01:00
29f03d95f3
Bug fix.
2009-10-07 19:20:34 -07:00
ab3bfca546
Printout one more field in show threads, but this won't buy us much.
2009-10-07 17:29:21 -07:00
6f2d183107
Merge branch 'master' into htb-throttle
2009-10-07 03:01:11 +01:00
b5b53dd3eb
* One more debug message on FetchInventoryDescendants
...
* More streams close on finally
2009-10-06 19:55:35 -07:00
89d23a1fa2
Revert "Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed."
...
This reverts commit e992ca0255
2009-10-07 01:45:49 +01:00
9618c196c2
Revert "Merging in diva's locking fixes"
...
This reverts commit 832cc68513
2009-10-07 01:44:36 +01:00
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
e992ca0255
Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed.
2009-10-06 15:39:53 -07:00
99c85b5ef5
* Change some more default ports to the robust default of 8003
...
* Make these use existing constants rather than hardcoding
* These will probably go away soon anyway once all services are under ROBUST
2009-10-06 20:32:33 +01:00
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
fb19d1ca0a
* Try/catch around EndInvoke() when Util.FireAndForget() returns to catch exceptions thrown in the async method
...
* Added packet stats handling to the new LLUDP implementation
* Attempting to avoid a race condition when creating a new LLUDPClient
2009-10-06 10:12:59 -07:00
e474fc2fdb
Corrected words in error message.
2009-10-06 08:50:25 -07:00
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
e7c877407f
* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
...
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
2009-10-06 02:38:00 -07:00
7ddb6fbced
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-05 17:38:27 -07:00
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
2753f4d62c
* GridServerPostHandler.cs: Try/catch in Handle
...
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
75b35ddf4a
More error messages to warn when/if things go wrong.
2009-10-05 09:18:51 -07:00
30aac00f6b
Closing more streams even if things fail.
2009-10-04 10:12:19 -07:00
f21f3727df
Leaving the MemoryStreams unclosed.
2009-10-04 09:20:01 -07:00
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
2d9c27a28f
Slightly better message with status code for WebException.
2009-10-03 20:18:21 -07:00
b6920267f0
Close was being called to early on the Memory stream.
2009-10-03 16:27:55 -07:00
df7049008a
More streams closed.
2009-10-03 08:57:30 -07:00
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
4843edfeb7
Closing more streams.
2009-10-03 08:33:19 -07:00
006dfd6d9a
Closing another stream.
2009-10-02 20:35:15 -07:00
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
e66321227e
Close streams in MakeRequest.
2009-10-02 16:23:46 -07:00
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
133a4a9906
- adding new LandDataSerializer testcase to "test-xml" target as well
...
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
05da73c300
fixing LandDataSerializer (yeah! for testcases)
2009-10-01 12:01:41 +02:00
18416ec518
Merge branch 'oar-parcel' into x-opensim
2009-10-01 10:30:43 +02:00
77ed8e977a
adding meat to the LandDataSerializerTest cases.
2009-10-01 10:30:26 +02:00
5b378a793b
Merge branch 'oar-parcel' into x-opensim
2009-10-01 09:48:30 +02:00
40cf840df2
adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)
2009-10-01 09:47:45 +02:00
44776fea72
Fixing LLClientView memory leak
...
Fixing LLClientView memory leak by disposing of all timers utilized
in LLClientView as they contain references to the callback method.
This required the use of the Terminate and Close infrastructure that
was already in place but was not being utilized.
2009-10-01 04:11:32 +01:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
5dfd2643df
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
...
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
2009-09-30 15:53:03 -07:00
79ba96ad6f
Limit the number of packet data blocks to 50, as packets are already limited
...
This is enough to prevent the fast back and forth of allocation and release
the pool is meant to prevent, but not too much so we don't hog memory
2009-09-30 21:33:29 +01:00
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
41e4f3afdb
Remove some tests that no longer apply
2009-09-30 19:14:58 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
33515c75e4
adding LandDataSerializer (not connected anywhere, work-in-progress)
...
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
1006a2254c
Make create user to the Right Thing with regard to salting user passwords
2009-09-30 13:36:03 +01:00
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
0709149313
Merge branch 'grid-service-redux'
2009-09-28 23:03:47 +01:00
7cd03abab5
Bump main version to 0.6.8-Dev
2009-09-28 18:41:21 +01:00
69da82b39f
Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer.
2009-09-28 06:44:57 -07:00
0f05bbb4a2
Deleted some files that aren't being used anymore.
2009-09-28 05:54:37 -07:00
5d09c53a1a
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
2009-09-27 10:14:10 -07:00
68e40a87ca
Poof! on LocalBackend. CommsManager.GridServices deleted.
2009-09-26 21:29:54 -07:00
f4bf581b96
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
...
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
632bb71262
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
...
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
e67341f24c
minor: replace xmlprc 'no method found' magic number with constant from xmlrpc library
2009-09-24 15:02:55 +01:00
7870152d23
Allow load/save iar password checks to be done in grid mode
...
This should allow load/save iar to work for grid mode as long as the grid user service is later than this revision
Grid services of earlier revisions will always erroneously report incorrect password. This will be addressed shortly.
2009-09-24 14:54:12 +01:00
71a4b02c7e
* Minor commit, added two new math utility functions.
2009-09-24 20:56:01 +10:00
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
03438f7d44
minor: remove double initialization of user appearance module in Grid.UserServer.Main
2009-09-23 16:24:26 +01:00
882d2c9cc3
Added hg console commands to the module.
...
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
c5be401d46
Remove support for executing a handler on poll. It caused other issues
2009-09-22 05:24:22 +01:00
06871d51dd
Disable the handler execution for poll services until the ramifications
...
can be studied
2009-09-22 05:13:50 +01:00
b6b8a18d37
Add the headers collection to the keysvals for HTT requests
2009-09-21 20:21:01 +01:00
61aaf3532a
Add X-PollServiceID pseudo-header to the request handling for polls
2009-09-21 20:10:26 +01:00
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
5511c62580
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-21 18:12:12 +01:00
6d0e7b6a6c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-21 11:05:20 -07:00
390137d540
Added grid handler and grid remote connector.
2009-09-21 11:05:01 -07:00
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
2a1b5e3540
A small fix for remote console to accommodate PollServiceArgs behavior a
...
bit better
2009-09-21 14:14:22 +01:00
2d9d25b367
Add the skeleton of the authentication connector and the forms data requester
2009-09-19 17:33:57 +01:00
6461243e7c
Remove the methods for full inventory fetch from the connector. Remove tests
...
for the old, removed asset handlers
2009-09-17 23:55:06 +01:00
6779abf7f5
Remove The legacy inventory and asset servers. Bump interface version to 6
2009-09-17 23:39:58 +01:00
44f1092b83
moved AuthorizationRequest and AuthorizationResponse to IAuthorizationService to keep service dependencies together.
2009-09-11 09:23:09 -07:00
eaec7cf39c
Changed RemoteAuthorizationServiceConnector so that it implements the IAuthorization interface method isAuthorizedForRegion looks up user and region data and delegates the remote authorization check to the AuthorizationServiceConnector
...
This keeps the IAuthorization as clean as possible and moves the dependency of using a UserProfileData object out to the connector from the scene.
2009-09-11 06:50:24 -07:00
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
b5c8925fdf
added AuthorizationRequest and AuthorizationResponse objects for passing Authorization messages over http. Added handling code for these in the AuthorizationServerConnector and AuthorizationServicesConnector
2009-09-10 17:53:05 -07:00
552ba5334f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-10 18:14:34 +01:00
f5feb25dd1
fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0
2009-09-10 17:08:26 +01:00
0034dd043f
Many databases contain folders with invalid folder ID. Folder IDs are
...
supposed to be within -1 .. 22 and other values break inventory loading.
This patch fixes it and allows inventory to load. Invalid folder types
will be treated as ordinary folders.
2009-09-10 00:33:00 +01:00
0683cf6e0d
Add test to check behaviour if an iar is loaded where no user profile exists for the creators
...
Disable generation of temporary profiles for now, instead record loading user as creator
2009-09-09 18:03:49 +01:00
b7256f2567
extend load iar test to loading into a deeply nested directory
...
correct bug associated with this
2009-09-08 17:42:07 +01:00
5e4b7be712
* Typo in previous commit.
2009-09-06 21:53:03 +10:00
25313c2105
* Debugging why region loading is occurring so slowly on a setup with 64 regions in a Regions.ini (took 38 minutes on my test box)
2009-09-06 21:52:11 +10:00
f23f7b1fc4
preparing LandData seriali(s|z)ation into OAR [not yet functional]
2009-09-04 10:12:36 +02:00
584c113836
Added Util.FireAndForget(), to replace leaking calls to Delegate.BeginInvoke()
2009-09-03 12:27:23 -07:00
8e7b385883
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-02 16:29:50 +01:00
65d7644993
Correct the icons on wearables in agent inventory. To fully correct the issue
...
immediately, run
update inventoryfolders set version=version+1;
2009-09-02 16:27:08 +01:00
05756e1fb9
warnings safari.
2009-09-02 11:06:18 +02:00
994c5e2094
Prevent the Viewer's threaded inventory retrieval causing a OOM and overload
...
the inventory server by serializing upstream requests.
2009-09-02 05:04:24 +01:00
976cf4284b
Fix up WebFetchInventoryDescendents to really return all data needed,
...
especially the folder version and the subfolders. Fixes inventory search
hang and folders not loading.
2009-08-29 03:26:44 +01:00
22a0dff226
Modify CAPS inventory code. Currently this is not executed
2009-08-28 23:28:32 +01:00
d649194be3
minor: formatting and comments
2009-08-28 12:52:40 +01:00
6f077d5e5f
* Another attempt at fixing the random spurious test error.
...
* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that.
2009-08-26 21:05:46 -04:00
8a9d168928
Add try/catch around EQ request processing
...
Fixes Mantis #4061
2009-08-26 14:46:10 +01:00
02f937b0dc
Fix some compile warnings.
2009-08-26 14:02:52 +09:00
5f794d3e59
A slightly modified version of
...
http://opensimulator.org/mantis/view.php?id=4040 by jhurliman. The patch didn't match up, so I winged it here. My effort to manually merge the patch seems to make sense, so I'm going to commit it.
2009-08-25 17:36:04 -04:00
cfd9cf7b18
Closed the web request and stream in SynchronousRestSessionObjectPoster -- maybe this is the cause of some timeouts seen in some monos?
2009-08-25 06:17:36 -07:00
1e4238af92
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-22 20:18:56 +01:00
a22b12ecd4
Change prompt handling in console. No user changes
2009-08-22 20:18:24 +01:00
b03eeeb9f6
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044 . Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
...
* Removed left-overs from AssetInventoryServer.
2009-08-22 10:24:26 -07:00
75021b5309
Moved AuthedSessionCache to where it is used -- Grid/InventoryServer.
2009-08-22 09:03:59 -07:00
3318652723
Added a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObjectRequester so that it also understands PUTs.
2009-08-21 11:00:45 -07:00
70c870972a
Fix the user and password defaults int he remote console setup
2009-08-21 00:25:50 +01:00
ae2ceda479
* Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a valid TextureEntry. About half the time update_avatar_appearance calls are made, the TextureEntry is empty
2009-08-20 10:32:38 -07:00
b1853d9f26
Fixing a spot I missed in assets. Switching Grid to the new naming schema with Store/Get
2009-08-19 23:46:25 +01:00
f1287cc7af
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
2009-08-19 23:45:22 +01:00
d519f1885f
Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently).
2009-08-19 10:56:08 -07:00
4818d11b9d
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 00:31:51 -07:00
c5af39239f
A better purge of trash folder.
2009-08-19 00:13:51 -07:00
124f66bfc2
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
2009-08-18 22:17:47 -07:00
2111c66f89
Graft the REST console onto the message server as well. What a dirty hack!
...
Works the same as the others.
2009-08-19 05:40:23 +01:00
dd0234f500
Graft the REST console onto the grid server. Same procedure as with
...
the user server.
2009-08-19 05:15:25 +01:00
99c7a43ffd
Add rest console support to the user server. Will ask new questions at
...
startup. To use, run it normally once, answering the questions, then
run again with -console=rest.
Also now supports -console=basic for a console that reads stdin
2009-08-19 04:39:02 +01:00
806f48d81a
Added one conditional missing on login, for creating inventory if it doesn't exist already. This hopefully fixes the master avatar problems on standalone.
2009-08-17 17:00:27 -07:00
59b4cf2d5b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 13:27:22 -07:00
4a992388e3
Apply http://opensimulator.org/mantis/view.php?id=4016
...
Make previously hidden cookies available to code
Thanks jhurliman
2009-08-17 20:02:42 +01:00
f34e89f385
* More Test tweaking to get down to the root cause of the test wierdness
2009-08-17 10:28:58 -04:00
94cd4c136c
Bumping the interface number down again, because this *may* not be a breaking change with older sims.
2009-08-17 06:41:26 -07:00
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
cef16bec6d
Add the OpenSim.ConsoleClient app.
...
Usage: OpenSim.ConsoleClient -h <host> -p <port> -u <user> -P <pass>
host defaults to localhost, port defaults to 8003.
2009-08-17 08:45:20 +01:00
002940dd5d
Filling in the blanks: The "meat" of the REST console
2009-08-17 05:00:30 +01:00
052c51f90f
Bumped up grid services interface number.
2009-08-16 20:38:30 -07:00
67a629081e
uh. how about *really* removing it, and not just write a comment above, hey diva?
2009-08-16 19:54:49 -07:00
87f116ab3a
Remove the call to ResetAttachments upon login. The info in the DB should always have {itemID, assetID}.
2009-08-16 19:51:16 -07:00
50056871b8
IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld UUID.
2009-08-16 19:35:14 -07:00
e02062051d
Making attachments work again. Tons of debug more. This needs more testing and a lot of cleaning.
2009-08-16 16:17:19 -07:00
bf8e07606f
* handle litjson errors for now. We'll remove this when we hear back from http://jira.openmetaverse.org/browse/LIBOMV-675
2009-08-16 17:19:52 -04:00
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
a42569d896
Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet Handler - ref mantis #4010
2009-08-16 15:06:06 +09:00
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
0781ac9a5e
* Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing a thread, a dead thread, and a null Thread
...
* Fix a null thread situation
2009-08-13 22:12:37 -04:00
21b5ebdc1f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 19:11:38 -07:00
7a761560c6
* Add AgentCircuitManager tests for adding, removing, changing circuit code, and authentication.
2009-08-13 21:01:39 -04:00
ded76723eb
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 17:45:17 -07:00
034c9cf606
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
2009-08-13 17:34:15 -07:00
f5fc5226f8
* Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test.
2009-08-13 18:10:09 -04:00
5246dc33dc
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
2009-08-13 14:10:12 -07:00
9bcca3dc95
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 12:39:46 -04:00
5b325f1f54
* minor: comments
2009-08-13 12:39:33 -04:00
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
94dfe2a20d
Add a profile module interface for the client view to use
2009-08-13 13:05:27 +01:00
b0292d59a5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-12 20:40:49 -07:00
7aa54593e0
Redirected all calls to CachedUserProfile methods to the inventory service. Redirection of the RootFolder property is still todo. This compiles but probably inventory will be inconsistent.
2009-08-12 20:39:48 -07:00
0a85d1d767
minor:comments
2009-08-12 23:34:12 -04:00
18634e9dd8
minor: comments
2009-08-12 23:18:00 -04:00
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09:00
41ad610f3e
* Added two new packet handler implementations for inventory ops. This is starting to work! - but can't be activated incrementally, the flip needs to be global for all inventory ops.
...
* Added a base inventory connector that does common processing of inventory among all reference connector implementations. E.g. AddItem requires additional processing before being forwarded to service.
* Added if (m_Enabled) upon RemoveRegion
2009-08-12 13:11:15 -07:00
613e6f07fc
change 535cb0efc so that the default LLSD serialization format is
...
llsd+xml instead of llsd+json --- the latter seems to break existing
bots. this assumes that those bots that want llsd+json will properly
signal that desire, if that is not the case, we need to revisit
this. fixes mantis #3977 .
2009-08-12 14:49:59 +02:00
bd7ff803fe
Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST.
2009-08-11 14:31:45 -07:00
dc897b2288
Merged with origin, and resolved one conflict in LoginServiceTests.cs
2009-08-11 10:51:49 -07:00
655438a59d
Apply http://opensimulator.org/mantis/view.php?id=1448
...
Store and retrieve user profile url at runtime
Not yet persisted
Thanks Fly-Man
2009-08-11 17:29:15 +01:00
bb64906a9c
Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
...
git log -n 1 --pretty="format:%h: %ci" > bin/.version
This command can also be run manually to create the bin/.version file.
This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H
The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
226c082ed4
Establish CachedUserInfo.OnInventoryReceived event so that region/test inventory code can be written with the async inventory fetch
2009-08-11 16:45:16 +01:00
18aa2ea0c5
* Improves SceneSetupHelper to allow the tester to choose a real or mock, inventory and asset, service modules. The boolean startServices was replaced with realServices string. If the string contains the word asset, it will start a real asset module, if it contains inventory, it starts a real inventory. Otherwise, it use mock (NullPlugin-like) objects, for tests that don't really need functionality.
...
* SetupScene is now actually sharing the asset and inventory modules if the tester wishes to have multiple regions connected. To link regions, just start SetupScene with the same CommunicationManager for all scenes. SceneSetupHelper will hold a static reference to the modules and won't initialize them again, just run the scenes through the modules AddRegion, RegionLoaded and PostInitialize.
* With the recent changes, both asset and inventory (and in the future, user) services should always be asked from the scene, not instantiated alone. The tests should reflect this new behavior and always start a scene.
2009-08-11 12:07:54 -03:00
cdcbc48534
Added two new methods to IIventoryService -- GetFolderForType and GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet.
2009-08-10 20:31:51 -07:00
0c47f8e7ab
Changed RequestRootFolder to GetRootFolder
2009-08-10 16:02:09 -07:00
17cc9b9857
Last piece of cleaning up old inventory. Old IInventoryServices and ISecureInventoryService interfaces removed.
2009-08-10 12:44:15 -07:00
34d0f119cb
Conditional to prevent a null ref in tests. The tests may still not pass.
2009-08-10 11:48:30 -07:00
5d2a157e64
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
2009-08-10 10:48:21 -07:00
d12c173a70
AssetCache.addin.xml seems to be historical junk too. Removed.
2009-08-10 09:01:07 -07:00
7e13e96f56
Removed IAssetServer.
2009-08-10 08:01:13 -07:00
024755d8b7
Slowly working my way towards the elimination of IAssetServer and IAssetCache.
2009-08-10 07:13:13 -07:00
a50904a68b
More clean up from asset cache legacy. None of these classes are used anymore.
2009-08-10 06:41:03 -07:00
c7484dc739
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-10 06:35:38 -07:00
ad016ba87c
Added some help instructions to the new RegionInfo region setup process; mainly to point out 'yes you can input information here.' since it seems to elude some users.
2009-08-10 19:06:09 +10:00
3f06fb3601
Removing unused files, legacy from old asset "cache".
2009-08-09 17:46:37 -07:00
04aca66330
Removed HGInventory out of core. This is part of HG2, which it now being developed outside.
2009-08-09 13:59:26 -07:00
8b9f8709aa
* FreeContext may be a bit too buggy for my tastes in some environments. * Commenting it for the moment.
2009-08-08 14:14:52 -04:00
dd03ad86c5
Change the default for internal IP address back to 0.0.0.0
2009-08-08 01:42:50 +01:00
257ed4c4ac
Remove debugging output frm ini file loading. Make it collect matching
...
files only from last path component.
2009-08-07 23:05:16 +01:00
e97beb07c9
Add extensive debug output to Util.Glob
2009-08-07 21:59:54 +01:00
d10f157183
Remove GetFullPath call from config includes, because it barfs in Windoze
2009-08-07 20:51:07 +01:00
178b40971a
Add a method to init the OSSL Api's m_LSL_Api member back to the OSSL Api
2009-08-07 19:50:47 +01:00
ea940d98f9
Added ToXml2() to ISceneObject, so that components other than regions can use this abstraction.
2009-08-06 16:41:24 -07:00
efc57bc3d7
Allow arbitrary wildcards in config includes. Things like
...
Include-Modules = "addin-modules/*/config/*.ini" will now work.
Adds Util.Glob, which will resolve a globbed path into a string list.
2009-08-06 02:29:12 +01:00
535cb0efc1
* Patch from jhurliman to add accept type recognition to determine the llsd content format. *should allow both json and xml serializations of llsd to work properly.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-08-05 16:47:48 -04:00
190bdc8a2e
* Remove some mono compiler warnings
2009-08-05 17:33:23 +01:00
acf7206f4b
Thank you kindly, dslake, for a patch that:
...
The region dearchive module assumes extra null bytes will be appended
to the end of every OAR file. This may be due to the block nature of
storage but it seems like an unsafe assumption. When streaming region
archives over a network or through a memory stream, no additional null
bytes are added to the end and this an exception.
2009-08-02 19:30:25 +00:00
fea3ffa154
* An enum for The VisualParams array that the viewer sends us with 90% of the documentation.
...
* Automatically generated using the BuildVisualParamsEnum Method that gets data from the libOMV VisualParams NameValue definitions which they generate from the the avatar_lad.xml file
* Want to know what element controls the eye size, jowls. pointy ears? no problem.
2009-08-02 06:38:52 +00:00
4ce5c894cf
Add copyright header. Formatting cleanup.
2009-08-01 05:11:47 +00:00
23a8895d29
* Fixed another potential httpserver leak.
2009-07-30 18:16:00 +00:00
07579fa402
Add basic support ofr detached request handling to the HTTP server.
...
Groundwork to finish HTTP IN.
2009-07-29 23:13:08 +00:00
83a421a562
* An attempt to fix mantis #3955
...
* It's possible it could re-cause mantis #3953 , but the FreeContext isn't always necessary because Connection: close ---> Disconnect(SocketError.Success) { FreeContext(); }
2009-07-29 21:53:18 +00:00
f727f26bcc
* An attempt to fix mantis #3953
2009-07-29 20:32:54 +00:00
50204f6ee2
* Re trigger panda
2009-07-29 02:41:00 +00:00
032aeb8b5d
* Adds the ability to have a thread efficient long poll service (such as the eventqueue)
...
* If this doesn't melt the Http Server, this will significantly reduce the number of threads in use on regions with many users.
* Adds AddPollServiceHTTPHandler, and RemovePollServiceHTTPHandler to BaseHttpServer
* Generic enough to be used for many long poll services, not only the EventQueue.
2009-07-29 02:15:45 +00:00
aa06d9f98b
Add the new StatusData block to the other two searchh packets
2009-07-28 19:28:01 +00:00
64c874a951
Fix a null data block in DirClassifiedReply packet, preventing a session
...
crash in search.
Fixes Mantis #3952
2009-07-28 18:46:45 +00:00
687e84048d
* as per my e-mail to opensim-dev archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007223.html
...
I'm bumping gridcomms interface version to 5.
MajorInterfaceVersion = 5
2009-07-25 21:16:48 +00:00
64bd9a3354
* Updates libOMV to version 0.7.0
...
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
2009-07-25 15:49:10 +00:00
a133e83f3a
Formatting cleanup.
2009-07-23 15:32:11 +00:00
c243ae43f2
* Updated C# WebServer to the latest available source download (r19869) and applied a few mods from the old version (now up on opensim-libs (VS 3.5 project).
...
* Made various changes to BaseHttpServer to accommodate the new interfaces.
* This version has been significantly re-architected and may fail in unusual and insidious ways.
* Please pay attention to any errors you get and post a Mantis if you can reproduce an issue with the HTTPServer. I'm including the pdb and having the http server compiled in debug for a few weeks so that when an error occurs, it'll print the pertenant data.
* Once again, this is the full C# WebServer, not the lite branch that is included in LibOMV (we need SSL!)
2009-07-21 06:47:29 +00:00
08819bcbea
* Created a way that the OpenSimulator scene can ask the physics scene to do a raycast test safely.
...
* Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see.
* Created a way to know if the user's camera is alt + cammed or just following the avatar.
* Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint)
2009-07-19 02:32:02 +00:00
acea31518b
fixed the bug where changing the rotation of a selection of prims in a linkset, made each of those prims rotate around its own centre rather than around the geometric centre of the selection like they should do (and like the client expects).
...
This involved adding a new OnUpdatePrimSingleRotationPosition event to IClientAPI so that we can get the changed position from the client.
Btw adding new events to IClientAPI is really tedious where you have to copy the change across to at least 5 or 6 other files.
[Note this doesn't fix the bug where any rotation changes to the root prim (but not the whole linkset) cause rotation errors on the child prims.]
2009-07-17 14:58:54 +00:00
5815162d7e
minor: remove some mono compiler warnings
2009-07-15 20:49:58 +00:00
6b3fc3ccb8
Bump version in Framework/Servers/VersionInfo to 0.6.6.
2009-07-15 05:24:06 +00:00
d9a8ecf238
Changed the DeRezObject event so it passes a list<uint> of localIDs in one event trigger rather than triggering the event once for every localid in the derez packet.
2009-07-12 12:32:39 +00:00
18ffbf6342
* minor format changes and message additions
2009-07-10 19:18:05 +00:00
d7d2de3a08
* minor: standardize some logging messages
2009-07-10 18:57:16 +00:00
148e2d55fa
* minor: Make GridCommon.ini.example refer to inventory service rather than asset where appropriate
...
* Send debug level notice to console if a user fails authentication
2009-07-10 18:40:37 +00:00
c310fb11f4
Remove all references to HttpServer from CommsManager (all incarnations)
...
Change all uses of the HttpServer properties to use the new singleton
2009-07-10 02:22:26 +00:00
7b457805a3
Create a MainServer static class to access the regions server's HTTP server
2009-07-10 00:59:43 +00:00
7e8bfc4618
* Allowing LLSD logins to do silent logout of last hung session on standalone only, following the already implemented XMLRPC behavior
2009-07-07 23:07:57 +00:00
5df21f9dcb
Fix previous commit
2009-07-04 18:20:18 +00:00
23c7d6b818
Add the new field agent_access_max. Without it being set to "A", viewers from
...
1.23 prevent the removal of underwear.
2009-07-04 18:15:01 +00:00
840f5f9485
- adding a Persistent flag to RegionInfo
...
- adding EstateSettings.Save() to RemoteAdmin ACL code (invoked only when region is persistent)
2009-07-03 15:36:47 +00:00
3564271c2d
Restore the functionality that was removed in r9928. This lets the load
...
balancer plugin work again. Create a new method, GetClientEP, to retrieve
only the EndPoint for script usage. Marked the purpose of the method
in IClientAPI.cs with a warning. Also restored the corresponding SetClientInfo
functionality.
2009-07-01 15:47:52 +00:00
aae94a8c80
add some more intuitive overloads for PrimitiveBaseShape SetPathRange and SetProfileRange
2009-07-01 01:27:36 +00:00
3dc2010da6
From: Chris Yeoh <yeohc@au1.ibm.com>
...
Attached is a patch that changes the oar file saving of creation date/time to an integer
instead of a string. I did this after justincc emailed me saying there is a problem
with internationalisation doing it the old way and I said I'd fix it. Its been
tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
2009-06-29 15:05:12 +00:00
147c9bcd45
Make cleartext authentication case sensitive. Thanks jhurliman for spotting this.
2009-06-27 07:49:10 +00:00
febd54499b
Enable the RemoteAdmin module to save regions as ini files rather than XML
2009-06-26 11:32:36 +00:00
5869598c4c
Make delete-region delete the section from an ini file. Will delete the whole
...
file if it has no sections left.
2009-06-26 00:00:20 +00:00
7cc69ac97f
Make create region save the new region to ini file format if the name
...
specifies an ini file.
If the ini file exists, the region will be added.
2009-06-25 23:31:55 +00:00
82305b0dea
From this version onwards, all new region files created automatically will
...
be created as new style INI files.
This doesn't yet affect create region, but it does affect first starts of
OpenSim.exe
Because master avatars are slated to be replaced by estate owners, this now
allows regions to be created without any master avatar data.
2009-06-25 17:53:03 +00:00
9e714b9784
Add a comment and an example region config file
2009-06-25 16:05:59 +00:00
d9528bd06e
Allow the reading of ini files instead of xml files when reading region
...
definitions from the file system
2009-06-25 15:48:54 +00:00
044446821b
Committing the meat of the user server interface and the bones of the service implementation
2009-06-22 12:18:04 +00:00
142b481e03
Update svn properties.
2009-06-22 10:07:27 +00:00
1adeb8ad77
From: Chris Yeoh <yeohc@au1.ibm.com>
...
This patch ensures that the touch positions are set during touch_end
events (currently only working for touch_start and touch events).
2009-06-19 12:21:20 +00:00
417e3ee1d7
Applied patch from Mantis #3736 , which should stop the userserver crashing when a SL viewer version 1.23 logs in. Thanks StrawberryFride
2009-06-18 20:01:37 +00:00
f243dddc04
* Corrected CAPS namespaces
...
* "luke, use the sed"
2009-06-18 14:33:35 +00:00
913bc3bdb3
Moved OpenSim/Framework/Communications/Capabilities up to OpenSim/Framework/Capabilities. Didn't change the namespace because VC# is not helping, and this would imply manually changing more than 50 files. So the namespace is still OpenSim.Framework.Communications.Capabilities, to be cleaned up later by someone with more energy.
2009-06-18 00:48:39 +00:00
ce7de3581c
Implementation of a simple authentication service + in connector in route to making HGInventory (client access) work in standalone again. This is the refactoring of what was/is there, but done in the new model. Not complete yet, but key authentication works. It should be enough to make HGInventory work again soon.
2009-06-17 03:52:39 +00:00
e6e88ac126
Give m_test* methods more reasonable names
...
Changing the names of these methods because they were being picked up by
nunit as tests even though they were marked private. Naming them Check*
after the original Test*.
2009-06-12 15:00:08 +00:00
2afd733229
Fixes mantis #3803 . Thanks jhurliman.
2009-06-11 20:27:13 +00:00
c13f3649d2
* Reinstating UserProfileCacheServiceTests. One test still fails (TestUpdateFolder)
2009-06-11 18:27:12 +00:00
156604e28e
InterServiceInventoryService references *almost* completely removed from the simulator. Only a couple left, not important. Also updated the login tests -- Justin, this time I was able to fix this by myself :)
2009-06-11 03:00:25 +00:00
6ddf70b128
Bug fix for creating users in standalone: the newly-created root folder was not being set in the cached profile. I suspect this bug has been around for a while.
2009-06-10 20:31:02 +00:00
f6c6e3e5f2
Attempt at disabling the inventory unit tests, so I can figure out how to fix them. The test setup is broken.
2009-06-10 13:33:26 +00:00
0f367bd7bb
Heart surgery no.2: the inventory service hooks.
...
Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.
2009-06-10 13:18:32 +00:00
a23d64dec1
Formatting cleanup.
2009-06-10 04:28:56 +00:00
a7fcacf8f3
Formatting cleanup. Ignore some generated files.
2009-06-09 18:07:35 +00:00
135ff63c3d
Update svn properties.
2009-06-09 17:48:22 +00:00
1ad237a8a7
First draft of inventory service connectors, and service implementation. No handlers yet, this is just the OUT part for now. It's not active and nothing in the simulator uses this yet. Just checking it in to start sharing with others. There are a couple of interesting software design points that could use other devs opinions.
...
Hopefully I added all needed files.
2009-06-07 19:00:55 +00:00
87097f2484
* Fix unit tests so that they correctly handle 404 missing asset response
...
* I didn't think there were tests in this area - my bad
2009-06-05 17:03:44 +00:00
593942b195
* Fix problem where known missing assets would stop save oar ever completing
...
* Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response
* So make asset service return http status NOT FOUND rather than OK in accordance with REST
* and interpret this correctly in the async response so that a null object is sent back
* This means that this fix won't be active until both region simulator and server reach this revision
2009-06-05 16:14:22 +00:00
bfea077508
* Add oar saving timeout
...
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds
* Timeout executes abort, since missing assets in an OAR seems bad
* This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service
* This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
2009-06-05 13:48:43 +00:00
5f923f0632
Add copyright headers.
2009-06-04 01:09:18 +00:00
007016ecd2
Update svn properties.
2009-06-04 00:51:02 +00:00
18cc7ffa44
Make AssetMetadata [Serializable] to help in binary caching
2009-06-03 19:54:19 +00:00
717fd3b5b9
From: Chris Yeoh <yeohc@au1.ibm.com>
...
This patch adds oar file date and time (UTC) meta data to an oar file
when it is created. It also adds a unique ID, though this id does not
in anyway identify the machine that the oar file was created on.
When an oar file with this meta data is loaded this extra information
is saved with the region settings and available via LSL through:
- osLoadedCreationDate()
- osLoadedCreationTime()
- osLoadedCreationID()
If there is no meta data these fields will be blank. Subsequent oar
file loads will erase the information for the previous oar file
load. Persistence has only been implemented for MySQL, the other
backends need updating.
Overall this allows us to much more easily identify the specific version of
software that clients are using. Its very straightforward to edit the oar file
to change the ID string to be something more human friendly.
Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql
required for the MySQL DB migration.
btw I had a chat with justincc about this a few weeks ago since he
wrote the oar file import/export and he sounded happy to accept
something that included date/time information but didn't want anything
that would silently leak private information like machine names.
2009-06-03 12:48:04 +00:00
9e3b592fa3
Thank you Imaze Rhiano for a patch that implements Cenome Memory Asset Cache (Mantis #3759 )
...
See the files: bin/config-include/GridCommon.ini.example and bin/config-include/StandaloneCommon.ini.example to configure and enable this caching method.
2009-06-03 08:41:08 +00:00
528db43326
revert r9765 due to too many errors on some compilers. Affects Mantis #3759
2009-06-03 02:03:11 +00:00
e978edc264
add body to an empty getter/setter
2009-06-03 01:27:07 +00:00
23e0c84f51
fix a int[] declaration
2009-06-03 01:06:00 +00:00
b38be1a7fd
Thank you Imaze Rhiano for a patch that implements Cenome Memory Asset Cache (Mantis #3759 )
...
See the files: bin/config-include/GridCommon.ini.example and bin/config-include/StandaloneCommon.ini.example to configure and enable this caching method.
2009-06-02 22:42:47 +00:00
8e011ecbbb
* Removed some commented-out code
2009-06-01 20:17:10 +00:00
eb330f71be
* Making silent logoff of old hung sessions for new connections default for
...
StandAlone users. Not touching grid.
2009-06-01 18:34:40 +00:00
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
35b450d41d
Add copyright headers, formatting cleanup, ignore some generated files.
2009-05-31 18:35:00 +00:00
e3e7e73db3
Added option (on my default) to the clone avatar function so that the clothes and attachments that the target avatar is wearing, to begin with, are removed. So the end result isn't a merger of those clothes/attachments and the ones the template avatar is wearing.
...
Added IPAddress ListenIPAddress property to BaseHttpServer so that the listening/binding IP can be set.
2009-05-30 16:13:40 +00:00
d0084f08f2
* Allows standalone region users to skip the "You must wait 5 minutes to log again" message and
...
allow the region to kick the old user and log the new one without reporting any failure.
Default is still to show message and fail login
2009-05-29 22:38:18 +00:00
4aad6a07ff
* refactor: Remove redundent prim id attribute on Scene.AddSceneObject()
2009-05-29 21:01:18 +00:00
42fa7cf989
plumbing for future sculpt map caching
2009-05-29 05:42:06 +00:00
0787967f59
* So, giving up on my efforts to de-duplicate the asset handlers. I'll just service commit my current state, then start over and this time concentrating only on the new handlers.
...
* Fixed some erroneous refs in Tests.Common
2009-05-27 18:27:28 +00:00
9e37e291b0
making TarArchiveReader more resilient when faced with OARs created by
...
ancient tars.
2009-05-27 17:34:06 +00:00
a576cca59e
Update svn properties.
2009-05-27 14:30:33 +00:00
7ab1986bf0
Catching weirdnesses on resolving External EndPoint in agent transfers. Will probably need to do more aggressively.
2009-05-26 22:39:01 +00:00
b773a3a02f
* We have strand flavours.
...
* The version string is now reported as "OpenSim 0.6.5 (Dev)"
* This has to be administrated manually.
2009-05-26 16:18:41 +00:00
5d23ecebeb
* Introduced GetVersionString so we can harness the whole thing.
...
* Introduced 'Flavour' to spice things up.
2009-05-26 16:01:06 +00:00
f76615a66d
* slowly getting there...
2009-05-26 15:46:09 +00:00
1cfcace30f
* Changed Version to property for great justice
2009-05-26 15:43:43 +00:00
bac1194391
* Added test to make sure version info is 27 chars long (still don't know exactly why it has to be that, though)
2009-05-26 15:35:55 +00:00
6ff01c774e
Addresses mantis #3718 .
2009-05-26 01:05:40 +00:00
582c20b1c4
* reseparate inventory item creator id and creator uuid
...
* unfortunately, while the client requires uuids and we want to be able to have arbitrary string ids, these cannot be kept in sync
* I think the problems last time were due to a serialization change
* So the major inteface version has been bumped to take care of any lingering issues here.
* This means that region servers beyond this revision can only connect to similarly uptodate grid services, and vice versa
2009-05-25 19:54:47 +00:00
896c206718
One more utility. Not used yet.
2009-05-25 19:20:27 +00:00
ca9432d110
* Display normal log information in the console's default foreground colour, for those of us with white backgrounds
2009-05-25 16:29:01 +00:00
ba360ede8b
* Upped version number to 0.6.5
2009-05-25 11:43:56 +00:00
a38285f7f9
* Attaches debug info to some DNS resolution code.
2009-05-25 06:46:41 +00:00
d4957dd9be
Update svn properties.
2009-05-25 01:59:50 +00:00
9023b93e2f
* Disabled NAT translation support for a little while.
2009-05-25 01:12:28 +00:00
2cfe44f13e
* Mono sucks. (Fixes crash due to Mono not implementing NetworkInformation.IPv4Mask aka Subnet masks)
2009-05-24 02:07:54 +00:00
ac79ff8dc6
* Adds NAT routing support for MXP Asset Delivery. (This means MXP should be fully NAT compatible.)
2009-05-24 01:36:13 +00:00
70f6a2852e
* Fixes [irritating] edge case in Util.GetLocalHost which could return an IPv6 address if no non-loopback IPv4 address can be found.
...
* Restores internal IPv6 support to NetworkUtil.*
* Fixes bad login unit tests.
2009-05-23 07:51:29 +00:00
6fe55a7ff8
* Disables internal IPv6 Support - causing issues.
2009-05-23 07:29:14 +00:00
bb363d9aa4
* "Fixed" an issue with NAT Login Handler, apparently an IPv4Mask can be null on an IPv4 address. Go figure. (!?!)
2009-05-23 07:07:02 +00:00
6b312d9340
* Implements automatic loopback handling for standalone regions.
...
* This /should/ make OpenSim behave properly when hosting behind a NAT router and utilizing port forwarding (but the router doesn't support Loopback)
2009-05-23 06:29:08 +00:00
e9ea959263
* Pipes IPEndPoint through all Login methods, including LLSD/OSD login paths.
2009-05-23 06:14:02 +00:00
31baeef469
* Pipes requestors IP address through all XmlRpcRequest delegates. This is needed to be able to 'NAT-wrap' the login sequence.
...
* If you have something using XmlRpc that isn't in core, change your method signature from:
(XmlRpcRequest request)
to:
(XmlRpcRequest request, IPEndPoint remoteClient)
2009-05-23 06:05:20 +00:00
3b1b3ac9bb
* Breaks OpenSim.. err I mean.. adds NAT translation support to EnableSimulator EventQueue methods.
...
* NB: This may actually break logins on certain regions. Shake well before consuming.
2009-05-23 05:44:18 +00:00
f8c569dc7c
* NetworkUtil now handles an error case in a way which is easier to debug.
2009-05-23 05:18:37 +00:00
2d06135166
* Adds new NetworkUtil class, contains methods for handling IP resolution when located on the same subnet. (Eg, can be used to avoid NAT Loopback requirements if fully utilized.)
...
* Adds a few new network-related methods to Util.
2009-05-23 05:09:10 +00:00
1d02636c27
cleaning out warnings.
...
NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?
2009-05-22 14:57:00 +00:00
ac2fe53e89
adding RemoveXmlRpcHandler to IHttpServer
2009-05-22 11:37:14 +00:00
da170cde46
Cleaning up a few HG things. HG Posts may now work in grids, but if the home grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection.
2009-05-22 04:23:59 +00:00
e5f3337c3f
Implement .ini file includes. Anything that begins with "Include-" will be
...
treated as another ini source to load.
For example:
Include-Asset = AssetSetup.ini
will load AssetSetup.ini after all other ini files are done.
This works recursively, too
2009-05-21 23:06:10 +00:00
787d58ae7f
Put some meat on the bones of the REST console. NO user functionality yet
2009-05-20 20:28:57 +00:00
3ae9bb6d83
Move the color console logic from the appender into the local console, since
...
that is the only one that can use it. Change appender output to always go
through the console output functions.
2009-05-20 14:40:50 +00:00
4065ebff15
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
e0bc5c5db2
Add copyright headers, formatting cleanup.
2009-05-20 01:32:06 +00:00
23d902be42
Remove the old asset cache and local services and the configurations for them
2009-05-18 23:18:04 +00:00
5cfd84c924
Update svn properties.
2009-05-17 10:26:00 +00:00
99cf8e3f5a
Send the owner name, not the client name on SendDialog.
...
This modifies IClientAPI.SendDialog slightly.
Fixes Mantis #3661 .
2009-05-16 16:01:25 +00:00
99167c68b1
Bug fix on POST asset so that the new asset service connector can talk to the old asset server.
2009-05-15 21:11:37 +00:00
c11e047410
* Resolve bug where save oar would never complete if any assets were missing
2009-05-15 20:20:55 +00:00
5e4fc6e91e
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
...
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
2009-05-15 05:00:25 +00:00
6277156044
* When saving an oar, save assets when immediately received rather than storing them all up in memory
...
* Hopefully this will remove out of memory problems when saving large oars on machines without much memory
* It may also speed up saving of large oars
2009-05-14 20:37:54 +00:00
303aa4b65e
* refactor: move bottom part of 'xml2' serializaton to separate class
2009-05-14 18:08:54 +00:00
d10b5e29bc
* refactor: break some of xml2 serialization out of sog
2009-05-14 16:33:04 +00:00
95d87244b0
* Moved BaseRequestHandlerTestHelper to OpenSim.Tests.Common.Setup for great justice.
2009-05-14 08:21:14 +00:00
d843b897b2
Move the connector for the new asset server to a connectors project. Inherit
...
the region module version from this. This enables inter-server connections
to reuse connetor code from region modules.
2009-05-14 06:18:18 +00:00
09df50915d
* Bug fix: Variable m_regionSettings can be null, using RegionSettings instead, that starts a new RegionSettings object if private variable is null.
...
Fixes Mantis #3634
2009-05-13 22:16:14 +00:00
40e95cab02
* Added some more tests to the GetAssetStreamHandlers
2009-05-13 17:11:53 +00:00
b95b7222f9
Disabling WebFetchInventoryDescendents CAPs for the time being as it
...
seems to screw up standalone mode.
2009-05-13 16:34:57 +00:00
a5feb0682a
Thank you kindly, BlueWall sir, for a patch that:
...
Adding a jsonp wrapper to the user supplied status report
uri if the key "callback" exists. It will work with many
javascript toolkits to provide an ajax callback to allow
the browser to update stats reports without the
intervention of an intermediate server.
2009-05-13 01:27:23 +00:00
1b7d0a6c93
Paving the way for syncing group permissions across a grid
2009-05-12 14:59:11 +00:00
c1d680b6c3
Thank you kindly, Patnad, for a patch that:
...
This is to handle the changes in the v1.23 viewer
of LL regarding the adult rating. With this patch
a region can be changed to the adult rating from
LL viewer v1.23 and above.
2009-05-12 03:30:37 +00:00
6dcafec22d
* Implements IP and DNS based ban facilities to OpenSim.
...
* User interface is ... primitive at best right now.
* Loads bans from bans.txt and region ban DB on startup, bans.txt is in the format of one per line. The following explains how they are read;
DNS bans are in the form "somewhere.com" will block ANY matching domain (including "betasomewhere.com", "beta.somewhere.com", "somewhere.com.beta") - make sure to be reasonably specific in DNS bans.
IP address bans match on first characters, so, "127.0.0.1" will ban only that address, "127.0.1" will ban "127.0.10.0" but "127.0.1." will ban only the "127.0.1.*" network
2009-05-11 19:23:51 +00:00
5164403676
Update svn properties.
2009-05-11 15:14:15 +00:00
85bbcf196f
adding code to check for old-style responses ("True")
2009-05-11 09:58:36 +00:00
54ab7d7ceb
* Rather than crash the region simulator, declare the teleport a failure if the "success" mapping doesn't exist. (also; I hate LLSD.)
2009-05-10 21:35:07 +00:00
dd8c01d7a7
* Attempting to fix NullRef exception in inventory.
2009-05-10 21:00:07 +00:00
2d4166fecf
* Debugging some inventory related NullRefException's.
2009-05-10 20:50:38 +00:00
a983f2a3ac
Create SynchronousRestObjectRequester and make SynchronousRestObjectPoster
...
use that. Mark SynchronousRestObjectPoster.BeginPostObject as obsolete.
2009-05-10 16:31:10 +00:00
dc4f31db1a
Create an async form of the RestObjectPoster. Rename the file (but not the
...
class!) to SynchronousRestObjectRequester. Add CacheBuckets parameter to
cache
2009-05-10 16:20:25 +00:00
1a910b6e1d
Connect up the new asset cache and introduce an asynchronous call path
...
for asset retrieval (full asset only) to ease migration to the new system
2009-05-10 14:03:06 +00:00
d8e1842d25
Add some asset cache plumbing. Change the generic cache from UUID to string
...
keys to allow caching the new crop of URI identified objects.
2009-05-10 12:27:05 +00:00
13b2ff83df
Small asset cache addition. Comment a debug output left in CAPS
2009-05-10 00:30:51 +00:00
1d234ca83f
Fixed handling of inventory a bit
...
- AssetType isn't InventoryType. Those enums contain different numbers. Use AssetType for the asset type, InventoryType for the inventory type.
- The ToString method (or ToLower) of AssetType/InventoryType doesn't necessarily return the correct LLSD string.
- Replaced several magic numbers by their corresponding enum.
- Fixed the invType for gestures and animations in the library.
This should fix Mantis #3610 and the non-terminating inventory loading
2009-05-09 21:11:12 +00:00
b3d29aaeb3
Make remote assets work through the new server system
2009-05-09 04:03:32 +00:00
c8d44971c4
Implement an ingenious solution to pacekt pool performance suggested by
...
dlslake.
2009-05-08 19:03:01 +00:00
c1a54c02d3
fix up the comments a little
...
From: Sean Dague <sdague@gmail.com>
2009-05-08 18:09:48 +00:00
dahlia