diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llprimitive | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/llprimitive')
19 files changed, 36 insertions, 220 deletions
diff --git a/linden/indra/llprimitive/legacy_object_types.h b/linden/indra/llprimitive/legacy_object_types.h index 8528a53..2716d8b 100644 --- a/linden/indra/llprimitive/legacy_object_types.h +++ b/linden/indra/llprimitive/legacy_object_types.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp index 4fb6904..eeb4b7f 100644 --- a/linden/indra/llprimitive/llmaterialtable.cpp +++ b/linden/indra/llprimitive/llmaterialtable.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h index 8290195..d366163 100644 --- a/linden/indra/llprimitive/llmaterialtable.h +++ b/linden/indra/llprimitive/llmaterialtable.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp index bbfa53e..dc389c1 100644 --- a/linden/indra/llprimitive/llprimitive.cpp +++ b/linden/indra/llprimitive/llprimitive.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -952,213 +952,16 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai | |||
952 | 952 | ||
953 | U32 old_face_mask = mVolumep->mFaceMask; | 953 | U32 old_face_mask = mVolumep->mFaceMask; |
954 | 954 | ||
955 | S32 face_bit = 0; | ||
956 | S32 cur_mask = 0; | ||
957 | |||
958 | // grab copies of the old faces so we can determine the TE mappings... | ||
959 | std::vector<LLProfile::Face> old_faces; // list of old faces for remapping texture entries | ||
960 | LLTextureEntry old_tes[9]; | ||
961 | |||
962 | for (S32 face = 0; face < mVolumep->getNumFaces(); face++) | ||
963 | { | ||
964 | old_faces.push_back(mVolumep->getProfile().mFaces[face]); | ||
965 | } | ||
966 | |||
967 | for (face_bit = 0; face_bit < 9; face_bit++) | ||
968 | { | ||
969 | cur_mask = 0x1 << face_bit; | ||
970 | if (old_face_mask & cur_mask) | ||
971 | { | ||
972 | S32 te_index = face_index_from_id(cur_mask, old_faces); | ||
973 | old_tes[face_bit] = *getTE(te_index); | ||
974 | //llinfos << face_bit << ":" << te_index << ":" << old_tes[face_bit].getID() << llendl; | ||
975 | } | ||
976 | } | ||
977 | |||
978 | |||
979 | // build the new object | 955 | // build the new object |
980 | sVolumeManager->unrefVolume(mVolumep); | 956 | sVolumeManager->unrefVolume(mVolumep); |
981 | mVolumep = volumep; | 957 | mVolumep = volumep; |
982 | 958 | ||
983 | U32 new_face_mask = mVolumep->mFaceMask; | 959 | U32 new_face_mask = mVolumep->mFaceMask; |
984 | S32 i; | 960 | if (old_face_mask != new_face_mask) |
985 | |||
986 | /* | ||
987 | std::string old_mask_string; | ||
988 | for (i = 0; i < 9; i++) | ||
989 | { | 961 | { |
990 | if (old_face_mask & (1 << i)) | ||
991 | { | ||
992 | old_mask_string.append("1"); | ||
993 | } | ||
994 | else | ||
995 | { | ||
996 | old_mask_string.append("0"); | ||
997 | } | ||
998 | } | ||
999 | std::string new_mask_string; | ||
1000 | for (i = 0; i < 9; i++) | ||
1001 | { | ||
1002 | if (new_face_mask & (1 << i)) | ||
1003 | { | ||
1004 | new_mask_string.append("1"); | ||
1005 | } | ||
1006 | else | ||
1007 | { | ||
1008 | new_mask_string.append("0"); | ||
1009 | } | ||
1010 | } | ||
1011 | |||
1012 | llinfos << "old mask: " << old_mask_string << llendl; | ||
1013 | llinfos << "new mask: " << new_mask_string << llendl; | ||
1014 | */ | ||
1015 | |||
1016 | |||
1017 | if (old_face_mask == new_face_mask) | ||
1018 | { | ||
1019 | // nothing to do | ||
1020 | return TRUE; | ||
1021 | } | ||
1022 | |||
1023 | if (mVolumep->getNumFaces() == 0 && new_face_mask != 0) | ||
1024 | { | ||
1025 | llwarns << "Object with 0 faces found...INCORRECT!" << llendl; | ||
1026 | setNumTEs(mVolumep->getNumFaces()); | 962 | setNumTEs(mVolumep->getNumFaces()); |
1027 | return TRUE; | 963 | } |
1028 | } | 964 | |
1029 | |||
1030 | |||
1031 | S32 face_mapping[9]; | ||
1032 | for (face_bit = 0; face_bit < 9; face_bit++) | ||
1033 | { | ||
1034 | face_mapping[face_bit] = face_bit; | ||
1035 | } | ||
1036 | |||
1037 | // Generate the face-type mappings | ||
1038 | for (face_bit = 0; face_bit < 9; face_bit++) | ||
1039 | { | ||
1040 | cur_mask = 0x1 << face_bit; | ||
1041 | if (!(new_face_mask & cur_mask)) | ||
1042 | { | ||
1043 | // Face doesn't exist in new map. | ||
1044 | face_mapping[face_bit] = -1; | ||
1045 | continue; | ||
1046 | } | ||
1047 | else if (old_face_mask & cur_mask) | ||
1048 | { | ||
1049 | // Face exists in new and old map. | ||
1050 | face_mapping[face_bit] = face_bit; | ||
1051 | continue; | ||
1052 | } | ||
1053 | |||
1054 | // OK, how we've got a mismatch, where we have to fill a new face with one from | ||
1055 | // the old face. | ||
1056 | if (cur_mask & (LL_FACE_PATH_BEGIN | LL_FACE_PATH_END | LL_FACE_INNER_SIDE)) | ||
1057 | { | ||
1058 | // It's a top/bottom/hollow interior face. | ||
1059 | if (old_face_mask & LL_FACE_PATH_END) | ||
1060 | { | ||
1061 | face_mapping[face_bit] = 1; | ||
1062 | continue; | ||
1063 | } | ||
1064 | else | ||
1065 | { | ||
1066 | S32 cur_outer_mask = LL_FACE_OUTER_SIDE_0; | ||
1067 | for (i = 0; i < 4; i++) | ||
1068 | { | ||
1069 | if (old_face_mask & cur_outer_mask) | ||
1070 | { | ||
1071 | face_mapping[face_bit] = 5 + i; | ||
1072 | break; | ||
1073 | } | ||
1074 | cur_outer_mask <<= 1; | ||
1075 | } | ||
1076 | if (i == 4) | ||
1077 | { | ||
1078 | llwarns << "No path end or outer face in volume!" << llendl; | ||
1079 | } | ||
1080 | continue; | ||
1081 | } | ||
1082 | } | ||
1083 | |||
1084 | if (cur_mask & (LL_FACE_PROFILE_BEGIN | LL_FACE_PROFILE_END)) | ||
1085 | { | ||
1086 | // A cut slice. Use the hollow interior if we have it. | ||
1087 | if (old_face_mask & LL_FACE_INNER_SIDE) | ||
1088 | { | ||
1089 | face_mapping[face_bit] = 2; | ||
1090 | continue; | ||
1091 | } | ||
1092 | |||
1093 | // No interior, use the bottom face. | ||
1094 | // Could figure out which of the outer faces was nearest, but that would be harder. | ||
1095 | if (old_face_mask & LL_FACE_PATH_END) | ||
1096 | { | ||
1097 | face_mapping[face_bit] = 1; | ||
1098 | continue; | ||
1099 | } | ||
1100 | else | ||
1101 | { | ||
1102 | S32 cur_outer_mask = LL_FACE_OUTER_SIDE_0; | ||
1103 | for (i = 0; i < 4; i++) | ||
1104 | { | ||
1105 | if (old_face_mask & cur_outer_mask) | ||
1106 | { | ||
1107 | face_mapping[face_bit] = 5 + i; | ||
1108 | break; | ||
1109 | } | ||
1110 | cur_outer_mask <<= 1; | ||
1111 | } | ||
1112 | if (i == 4) | ||
1113 | { | ||
1114 | llwarns << "No path end or outer face in volume!" << llendl; | ||
1115 | } | ||
1116 | continue; | ||
1117 | } | ||
1118 | } | ||
1119 | |||
1120 | // OK, the face that's missing is an outer face... | ||
1121 | // Pull from the nearest adjacent outer face (there's always guaranteed to be one... | ||
1122 | S32 cur_outer = face_bit - 5; | ||
1123 | S32 min_dist = 5; | ||
1124 | S32 min_outer_bit = -1; | ||
1125 | S32 i; | ||
1126 | for (i = 0; i < 4; i++) | ||
1127 | { | ||
1128 | if (old_face_mask & (LL_FACE_OUTER_SIDE_0 << i)) | ||
1129 | { | ||
1130 | S32 dist = abs(i - cur_outer); | ||
1131 | if (dist < min_dist) | ||
1132 | { | ||
1133 | min_dist = dist; | ||
1134 | min_outer_bit = i + 5; | ||
1135 | } | ||
1136 | } | ||
1137 | } | ||
1138 | if (-1 == min_outer_bit) | ||
1139 | { | ||
1140 | llinfos << (LLVolume *)mVolumep << llendl; | ||
1141 | llwarns << "Bad! No outer faces, impossible!" << llendl; | ||
1142 | } | ||
1143 | face_mapping[face_bit] = min_outer_bit; | ||
1144 | } | ||
1145 | |||
1146 | |||
1147 | setNumTEs(mVolumep->getNumFaces()); | ||
1148 | for (face_bit = 0; face_bit < 9; face_bit++) | ||
1149 | { | ||
1150 | cur_mask = 0x1 << face_bit; | ||
1151 | if (new_face_mask & cur_mask) | ||
1152 | { | ||
1153 | if (-1 == face_mapping[face_bit]) | ||
1154 | { | ||
1155 | llwarns << "No mapping from old face to new face!" << llendl; | ||
1156 | } | ||
1157 | |||
1158 | S32 te_num = face_index_from_id(cur_mask, mVolumep->getProfile().mFaces); | ||
1159 | setTE(te_num, old_tes[face_mapping[face_bit]]); | ||
1160 | } | ||
1161 | } | ||
1162 | return TRUE; | 965 | return TRUE; |
1163 | } | 966 | } |
1164 | 967 | ||
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h index 82df35c..4e36f55 100644 --- a/linden/indra/llprimitive/llprimitive.h +++ b/linden/indra/llprimitive/llprimitive.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llprimlinkinfo.h b/linden/indra/llprimitive/llprimlinkinfo.h index 8de5ca0..b1bfa03 100644 --- a/linden/indra/llprimitive/llprimlinkinfo.h +++ b/linden/indra/llprimitive/llprimlinkinfo.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2007&license=internal$ | 6 | * $LicenseInfo:firstyear=2007&license=internal$ |
7 | * | 7 | * |
8 | * Copyright (c) 2007-2008, Linden Research, Inc. | 8 | * Copyright (c) 2007-2009, Linden Research, Inc. |
9 | * | 9 | * |
10 | * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of | 10 | * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of |
11 | * this source code is governed by the Linden Lab Source Code Disclosure | 11 | * this source code is governed by the Linden Lab Source Code Disclosure |
diff --git a/linden/indra/llprimitive/lltextureanim.cpp b/linden/indra/llprimitive/lltextureanim.cpp index afdd3ba..7dcfb02 100644 --- a/linden/indra/llprimitive/lltextureanim.cpp +++ b/linden/indra/llprimitive/lltextureanim.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/lltextureanim.h b/linden/indra/llprimitive/lltextureanim.h index 3fc4772..8e886d4 100644 --- a/linden/indra/llprimitive/lltextureanim.h +++ b/linden/indra/llprimitive/lltextureanim.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/lltextureentry.cpp b/linden/indra/llprimitive/lltextureentry.cpp index e1a4882..07be994 100644 --- a/linden/indra/llprimitive/lltextureentry.cpp +++ b/linden/indra/llprimitive/lltextureentry.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/lltextureentry.h b/linden/indra/llprimitive/lltextureentry.h index f933872..2663ebb 100644 --- a/linden/indra/llprimitive/lltextureentry.h +++ b/linden/indra/llprimitive/lltextureentry.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/lltree_common.h b/linden/indra/llprimitive/lltree_common.h index b63e00a..1e53c70 100644 --- a/linden/indra/llprimitive/lltree_common.h +++ b/linden/indra/llprimitive/lltree_common.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -36,6 +36,19 @@ | |||
36 | 36 | ||
37 | struct LLTree_gene_0 | 37 | struct LLTree_gene_0 |
38 | { | 38 | { |
39 | LLTree_gene_0() | ||
40 | : scale(0), | ||
41 | branches(0), | ||
42 | twist(0), | ||
43 | droop(0), | ||
44 | species(0), | ||
45 | trunk_depth(0), | ||
46 | branch_thickness(0), | ||
47 | max_depth(0), | ||
48 | scale_step(0) | ||
49 | { | ||
50 | } | ||
51 | |||
39 | // | 52 | // |
40 | // The genome for a tree, species 0 | 53 | // The genome for a tree, species 0 |
41 | // | 54 | // |
diff --git a/linden/indra/llprimitive/lltreeparams.cpp b/linden/indra/llprimitive/lltreeparams.cpp index 432707e..59535ba 100644 --- a/linden/indra/llprimitive/lltreeparams.cpp +++ b/linden/indra/llprimitive/lltreeparams.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/lltreeparams.h b/linden/indra/llprimitive/lltreeparams.h index fe9ea62..08c72f3 100644 --- a/linden/indra/llprimitive/lltreeparams.h +++ b/linden/indra/llprimitive/lltreeparams.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llvolumemessage.cpp b/linden/indra/llprimitive/llvolumemessage.cpp index 9f98f27..4be9d15 100644 --- a/linden/indra/llprimitive/llvolumemessage.cpp +++ b/linden/indra/llprimitive/llvolumemessage.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llvolumemessage.h b/linden/indra/llprimitive/llvolumemessage.h index 7e52988..9dfcd91 100644 --- a/linden/indra/llprimitive/llvolumemessage.h +++ b/linden/indra/llprimitive/llvolumemessage.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llvolumexml.cpp b/linden/indra/llprimitive/llvolumexml.cpp index 2c83f68..4a33db9 100644 --- a/linden/indra/llprimitive/llvolumexml.cpp +++ b/linden/indra/llprimitive/llvolumexml.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/llvolumexml.h b/linden/indra/llprimitive/llvolumexml.h index a6d0ed2..0b59c4c 100644 --- a/linden/indra/llprimitive/llvolumexml.h +++ b/linden/indra/llprimitive/llvolumexml.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/material_codes.h b/linden/indra/llprimitive/material_codes.h index 968c54e..088eecf 100644 --- a/linden/indra/llprimitive/material_codes.h +++ b/linden/indra/llprimitive/material_codes.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2000-2008, Linden Research, Inc. | 7 | * Copyright (c) 2000-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/llprimitive/object_flags.h b/linden/indra/llprimitive/object_flags.h index 2407126..dbd3556 100644 --- a/linden/indra/llprimitive/object_flags.h +++ b/linden/indra/llprimitive/object_flags.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |