aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-01 00:47:12 +0100
committerJustin Clark-Casey (justincc)2010-07-01 00:47:12 +0100
commit92502687538e2f9dd8d473aad9e9ef1c75091dd8 (patch)
tree55f795a16b90c345fb3353b5971829b77947c4e5 /OpenSim
parentdo a whole load of crappy hacking to get cubes to display google.com (diff)
downloadopensim-SC_OLD-92502687538e2f9dd8d473aad9e9ef1c75091dd8.zip
opensim-SC_OLD-92502687538e2f9dd8d473aad9e9ef1c75091dd8.tar.gz
opensim-SC_OLD-92502687538e2f9dd8d473aad9e9ef1c75091dd8.tar.bz2
opensim-SC_OLD-92502687538e2f9dd8d473aad9e9ef1c75091dd8.tar.xz
have a stab at sending the correct number of media entries to shapes
actually, this is probably wrong anyway if there's a default texture it's going to be easier just to gather the object media updates and retain those in-memory now but what the hell
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs16
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index b6fa53f..30507a4 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -128,8 +128,20 @@ namespace OpenSim.Region.CoreModules.Media.Moap
128 protected string HandleObjectMediaRequestGet( 128 protected string HandleObjectMediaRequestGet(
129 string path, Hashtable osdParams, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 129 string path, Hashtable osdParams, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
130 { 130 {
131 // Yeah, only for cubes right now. I know it's dumb. 131 UUID primId = (UUID)osdParams["object_id"];
132 int faces = 6; 132
133 SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
134
135 if (null == part)
136 {
137 m_log.WarnFormat(
138 "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in the scene",
139 primId);
140 return string.Empty;
141 }
142
143 int faces = part.GetNumberOfSides();
144 m_log.DebugFormat("[MOAP]: Faces [{0}] for [{1}]", faces, primId);
133 145
134 MediaEntry[] media = new MediaEntry[faces]; 146 MediaEntry[] media = new MediaEntry[faces];
135 for (int i = 0; i < faces; i++) 147 for (int i = 0; i < faces; i++)