From: Art Cancro <ajc@citadel.org>
Date: Wed, 20 Apr 2016 14:17:22 +0000 (-0400)
Subject: LoadXRoomPic() and the XHaveRoomPicLoaded conditional moved from OIMG to DLRI server... 
X-Git-Tag: Release_902~25
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=409d250c27dc04da7280648445289a54bf77c9ad

LoadXRoomPic() and the XHaveRoomPicLoaded conditional moved from OIMG to DLRI server command
---

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 2ea692862..3aa28ea91 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -590,22 +590,24 @@ void LoadXRoomPic(void)
 {
 	wcsession *WCC = WC;
 	StrBuf *Buf;
+	off_t bytes;
 	
-	if (WCC->CurRoom.XHaveRoomPicLoaded)
+	if (WCC->CurRoom.XHaveRoomPicLoaded) {
 		return;
+	}
 
 	WCC->CurRoom.XHaveRoomPicLoaded = 1;
 	Buf = NewStrBuf();
-	serv_puts("OIMG _roompic_");
+	serv_puts("DLRI");
 	StrBuf_ServGetln(Buf);
-	if (GetServerStatus(Buf, NULL) != 2) {
-		WCC->CurRoom.XHaveRoomPic = 0;
-	} else {
+	if (GetServerStatus(Buf, NULL) == 6) {
+		StrBufCutLeft(Buf, 4);
+		bytes = StrBufExtract_long(Buf, 0, '|');
 		WCC->CurRoom.XHaveRoomPic = 1;
+		StrBuf_ServGetBLOBBuffered(Buf, bytes);		// discard the data
+	} else {
+		WCC->CurRoom.XHaveRoomPic = 0;
 	}
-	serv_puts("CLOS");
-	StrBuf_ServGetln(Buf);
-	GetServerStatus(Buf, NULL);
 	FreeStrBuf (&Buf);
 }