aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-02 17:23:13 +0000
committerJustin Clarke Casey2008-06-02 17:23:13 +0000
commit4453c8bc5c68affa7ebafcdeab47340203186017 (patch)
tree411d1e1220044e4a6d9e005151a9d45803d90c73 /OpenSim
parent* Submitting 3 files for the messagingserver that I've kept to myself. (diff)
downloadopensim-SC_OLD-4453c8bc5c68affa7ebafcdeab47340203186017.zip
opensim-SC_OLD-4453c8bc5c68affa7ebafcdeab47340203186017.tar.gz
opensim-SC_OLD-4453c8bc5c68affa7ebafcdeab47340203186017.tar.bz2
opensim-SC_OLD-4453c8bc5c68affa7ebafcdeab47340203186017.tar.xz
* experimental: Make OpenSim archiver save and reload all prim textures when not all faces have the same texture
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs13
3 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 9a44fbd..9b7771c 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1288,6 +1288,7 @@ namespace OpenSim.Data.MySQL
1288 row["ProfileHollow"] = s.ProfileHollow; 1288 row["ProfileHollow"] = s.ProfileHollow;
1289 row["Texture"] = s.TextureEntry; 1289 row["Texture"] = s.TextureEntry;
1290 row["ExtraParams"] = s.ExtraParams; 1290 row["ExtraParams"] = s.ExtraParams;
1291
1291 try 1292 try
1292 { 1293 {
1293 row["State"] = s.State; 1294 row["State"] = s.State;
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 391c7b3..6753a21 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -106,9 +106,9 @@ namespace OpenSim.Framework.Servers
106 106
107 if (m_stats != null) 107 if (m_stats != null)
108 Notice("show stats - statistical information for this server"); 108 Notice("show stats - statistical information for this server");
109 109
110 Notice("show version - show server version.");
111 Notice("show uptime - show server startup time and uptime."); 110 Notice("show uptime - show server startup time and uptime.");
111 Notice("show version - show server version.");
112 Notice("shutdown - shutdown the server.\n"); 112 Notice("shutdown - shutdown the server.\n");
113 113
114 break; 114 break;
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index c9a7f07..86ee753 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -77,8 +77,17 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
77 77
78 foreach (SceneObjectPart part in sceneObject.GetParts()) 78 foreach (SceneObjectPart part in sceneObject.GetParts())
79 { 79 {
80 LLUUID texture = new LLUUID(part.Shape.TextureEntry, 0); 80 // XXX: Not a great way to iterate through face textures, but there's no
81 textureUuids[texture] = 1; 81 // other way to tell how many faces there actually are
82 //int i = 0;
83 foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures)
84 {
85 if (texture != null)
86 {
87 //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++);
88 textureUuids[texture.TextureID] = 1;
89 }
90 }
82 } 91 }
83 } 92 }
84 } 93 }