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
393a782858
Fix the crashed session notification from the userserver.
2010-02-25 18:05:30 +01: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
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +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
2d9b69c186
Merge branch 'master' into careminster
2010-01-28 02:07:18 +00: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
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
19d4867af7
* Quick fix to Remote Console session ID handling.
2010-01-26 07:40:33 +11:00
946e06eb58
Merge branch 'master' into careminster
2010-01-21 23:47:40 +00: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
8c39392eaa
Merge branch 'master' into careminster
2010-01-16 00:15:26 +00: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
20e748205e
Merge branch 'master' into careminster
2010-01-11 03:50:24 +00: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
1676e70dfe
Merge branch 'master' into careminster
2010-01-10 04:16:06 +00: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
121c6b4835
Merge branch 'master' into careminster
2010-01-09 15:34:58 +00:00
332463ca94
Fix up the weird Lindenish "setaccess" message. Talk about strange....
2010-01-09 15:28:52 +00:00
a764eb5dc7
Merge branch 'master' into careminster
2010-01-09 14:21:50 +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
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +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
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +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
b321c0a932
Merge branch 'master' into careminster
2009-12-31 21:53:39 +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
67cfac0cf1
Merge branch 'master' into careminster
2009-12-29 18:41:45 +00:00
0b5cdc539c
Change teleports so the TeleportFlags are sent to the destination sim. It
...
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
2009-12-29 18:35:06 +00:00
f3a4860635
Merge branch 'master' into careminster
2009-12-26 04:13:27 +00:00
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
59f683066a
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
...
in the repo. This is the Caremninster repo and the number follows CORE. Always.
2009-12-25 23:23:49 +00:00
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +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
bde26a8282
Add missing file
2009-12-22 06:43:03 +01:00
b53b871669
Add a data path for error messages
2009-12-22 06:25:32 +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
84a1a0a729
Merge branch 'master' into careminster
2009-12-21 22:07:22 +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
b891291135
Merge branch 'master' into careminster
2009-12-21 15:02:57 +00: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
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
eecaa3d9dd
Merge branch 'tests'
2009-12-19 20:00:00 -05:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
6dbe25360e
Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.
2009-12-17 18:40:34 +01: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
f8b6bc8d11
Merge branch 'master' into careminster
2009-12-15 15:46:18 +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
824d7190c2
Merge branch 'master' into careminster
2009-12-14 00:40:56 +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
30d64444a0
And reverse
2009-12-12 16:01:53 +00:00
9904700dfd
Another whitespace test commit
2009-12-12 16:00:44 +00:00
c00158b238
Reverse test commit (again)
2009-12-12 14:35:12 +00:00
794419852b
Another test
2009-12-12 14:23:20 +00:00
fbafd22124
Reverse text commit whitespace change
2009-12-12 13:43:49 +00:00
b9cd66d510
test commit
2009-12-12 13:33:45 +00:00
0fdf883cbd
Merge branch 'master' into careminster
2009-12-12 04:56:28 +00: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
1382dc976c
Merge branch 'master' into careminster
2009-12-12 04:14:47 +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
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
dbd8c400ce
Merge branch 'careminster' into windlight
2009-12-07 18:14:02 +01:00
29a740ec8c
Initial windlight codebase commit
2009-12-07 18:05:40 +01:00
9155c9ee37
Merge branch 'master' into careminster
2009-12-07 14:14:00 +00:00
172e2f4e76
Fix to existing ReaderWriterLockSlim implementations
2009-12-06 17:23:07 +01: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
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01: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
ded16d3529
Merge branch 'master' into careminster
2009-12-02 00:36:53 +00:00
4af77e84b1
* Fix Inconsistent line ending style in Util
2009-12-01 10:21:22 -05:00
69d83e1548
Merge branch 'master' into careminster
2009-11-30 08:25:40 +00: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
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00: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
ad2f0a1290
Remove OS version crap from about dialog
2009-11-26 18:04:58 +00:00
bd3b9f79c2
Update CM version
2009-11-26 17:59:28 +00:00
ed148eba32
Merge branch 'master' into careminster
2009-11-26 17:45:09 +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
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +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
Melanie