aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorMW2007-07-26 17:41:31 +0000
committerMW2007-07-26 17:41:31 +0000
commitf0dd115a8c5c44ebde4631df3469c6e39510325f (patch)
tree86d7557112d9e72d9084fc6b5d05cb6da86133a3 /OpenSim/Framework/General
parent* Started renaming world to Scene (diff)
downloadopensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.zip
opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.tar.gz
opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.tar.bz2
opensim-SC_OLD-f0dd115a8c5c44ebde4631df3469c6e39510325f.tar.xz
More work on inventory and opensim library.
Fixed a number of bugs in the AssetCache related to asset downloading.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs5
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs5
-rw-r--r--OpenSim/Framework/General/Types/AgentWearable.cs5
3 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index e13016b..0bfd827 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -156,6 +156,11 @@ namespace OpenSim.Framework.Interfaces
156 get; 156 get;
157 } 157 }
158 158
159 LLUUID SessionId
160 {
161 get;
162 }
163
159 string FirstName 164 string FirstName
160 { 165 {
161 get; 166 get;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 1b42064..aefb384 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -84,6 +84,11 @@ namespace OpenSim.Framework
84 get { return m_uuid; } 84 get { return m_uuid; }
85 } 85 }
86 86
87 public LLUUID SessionId
88 {
89 get { return LLUUID.Zero; }
90 }
91
87 public virtual string FirstName 92 public virtual string FirstName
88 { 93 {
89 get { return ""; } 94 get { return ""; }
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 9de25b5..8c704ce 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
@@ -43,13 +43,16 @@ namespace OpenSim.Framework.Types
43 { 43 {
44 get 44 get
45 { 45 {
46 AvatarWearable[] defaultWearables = new AvatarWearable[13]; //should be 13 of these 46 AvatarWearable[] defaultWearables = new AvatarWearable[13]; //should be 13 of these
47 for (int i = 0; i < 13; i++) 47 for (int i = 0; i < 13; i++)
48 { 48 {
49 defaultWearables[i] = new AvatarWearable(); 49 defaultWearables[i] = new AvatarWearable();
50 } 50 }
51 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 51 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
52 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"); 52 defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
53
54 //defaultWearables[1].ItemID = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9");
55 //defaultWearables[1].AssetID = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
53 return defaultWearables; 56 return defaultWearables;
54 } 57 }
55 } 58 }