diff options
author | lbsa71 | 2009-04-13 20:04:18 +0000 |
---|---|---|
committer | lbsa71 | 2009-04-13 20:04:18 +0000 |
commit | 29355de6ee01b1f44f32ea45b9c06f636ae9a241 (patch) | |
tree | 677fb0c71117a6feaa5891f5c7ceacdd8d2069a6 /OpenSim/Framework/Communications/UserManagerBase.cs | |
parent | * Remove null reference exception in the J2KDecoderModule's J2K repair routin... (diff) | |
download | opensim-SC-29355de6ee01b1f44f32ea45b9c06f636ae9a241.zip opensim-SC-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.gz opensim-SC-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.bz2 opensim-SC-29355de6ee01b1f44f32ea45b9c06f636ae9a241.tar.xz |
* Some more experimental work on distributed assets. Nothing hotwired yet.
* Introduced preprocess step in FetchAsset (Might revert this later)
* Some minor CCC
* Added actual implementation of GetUserProfile( uri ) and the corresponding handler to OGS1.
* Introduced non-functioning GetUserUri( userProfile) awaiting user server wireup (this might move elsewhere)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index b7280d3..155f5cd 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Communications | |||
124 | 124 | ||
125 | public UserProfileData GetUserProfile(Uri uri) | 125 | public UserProfileData GetUserProfile(Uri uri) |
126 | { | 126 | { |
127 | throw new System.NotImplementedException(); | 127 | throw new NotImplementedException(); |
128 | } | 128 | } |
129 | 129 | ||
130 | public UserAgentData GetAgentByUUID(UUID userId) | 130 | public UserAgentData GetAgentByUUID(UUID userId) |
@@ -142,6 +142,11 @@ namespace OpenSim.Framework.Communications | |||
142 | return null; | 142 | return null; |
143 | } | 143 | } |
144 | 144 | ||
145 | public Uri GetUserUri(UserProfileData userProfile) | ||
146 | { | ||
147 | throw new NotImplementedException(); | ||
148 | } | ||
149 | |||
145 | // see IUserService | 150 | // see IUserService |
146 | public virtual UserProfileData GetUserProfile(UUID uuid) | 151 | public virtual UserProfileData GetUserProfile(UUID uuid) |
147 | { | 152 | { |
@@ -835,6 +840,5 @@ namespace OpenSim.Framework.Communications | |||
835 | } | 840 | } |
836 | 841 | ||
837 | #endregion | 842 | #endregion |
838 | |||
839 | } | 843 | } |
840 | } | 844 | } |