OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. 

(Files .xml and .txt also want to be committed)
prebuild-update
Diva Canto 2010-08-18 16:22:50 -07:00
parent 8c12f22140
commit e47608fc62
3 changed files with 367 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
OpenSim/Framework/NetworkUtil.cs
View File

@ -274,37 +274,49 @@ namespace OpenSim.Framework
} }
} }
// Check for same LAN segment // Check for private networks
foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets) if (user.ToString().StartsWith("192.168"))
{ {
byte[] subnetBytes = subnet.Value.GetAddressBytes(); m_log.Info("[NetworkUtil] Private network user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
byte[] localBytes = subnet.Key.GetAddressBytes(); return externalIPAddress;
byte[] destBytes = user.GetAddressBytes();
if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
return user;
bool valid = true;
for (int i = 0; i < subnetBytes.Length; i++)
{
if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
{
valid = false;
break;
}
}
if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
valid = false;
if (valid)
{
m_log.Info("[NetworkUtil] Local LAN user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
return externalIPAddress;
}
} }
// We may need to do more fancy configuration-based checks... I'm not entirely sure there is
// a 100% algorithmic manner of dealing with all the network setups out there. This code
// will evolve as people bump into problems.
//// Check for same LAN segment -- I don't think we want to do this in general. Leaving it here
//// for now as a reminder
//foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
//{
// byte[] subnetBytes = subnet.Value.GetAddressBytes();
// byte[] localBytes = subnet.Key.GetAddressBytes();
// byte[] destBytes = user.GetAddressBytes();
// if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
// return user;
// bool valid = true;
// for (int i = 0; i < subnetBytes.Length; i++)
// {
// if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
// {
// valid = false;
// break;
// }
// }
// if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
// valid = false;
// if (valid)
// {
// m_log.Info("[NetworkUtil] Local LAN user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
// return externalIPAddress;
// }
//}
// Otherwise, return user address // Otherwise, return user address
return user; return user;
} }

614
bin/assets/TexturesAssetSet/TexturesAssetSet.xml
View File

@ -422,312 +422,312 @@
<Key Name="fileName" Value="fb2ae204-3fd1-df33-594f-c9f882830e66.j2c" /> <Key Name="fileName" Value="fb2ae204-3fd1-df33-594f-c9f882830e66.j2c" />
</Section> </Section>
<Section Name="Beach Grass 1"> <Section Name="Beach Grass 1">
<Key Name="assetID" Value="18fb888b-e8f1-dce7-7da7-321d651ea6b0"/> <Key Name="assetID" Value="18fb888b-e8f1-dce7-7da7-321d651ea6b0"/>
<Key Name="name" Value="Beach Grass 1"/> <Key Name="name" Value="Beach Grass 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c" /> <Key Name="fileName" Value="18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c" />
</Section> </Section>
<Section Name="Cypress 1"> <Section Name="Cypress 1">
<Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/> <Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/>
<Key Name="name" Value="Cypress 1"/> <Key Name="name" Value="Cypress 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="fb2ae204-3fd1-df33-594f-c9f882830e66.j2c" /> <Key Name="fileName" Value="fb2ae204-3fd1-df33-594f-c9f882830e66.j2c" />
</Section> </Section>
<Section Name="Cypress 2"> <Section Name="Cypress 2">
<Key Name="assetID" Value="30047cec-269d-408e-0c30-b2603b887268"/> <Key Name="assetID" Value="30047cec-269d-408e-0c30-b2603b887268"/>
<Key Name="name" Value="Cypress 2"/> <Key Name="name" Value="Cypress 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="30047cec-269d-408e-0c30-b2603b887268.j2c" /> <Key Name="fileName" Value="30047cec-269d-408e-0c30-b2603b887268.j2c" />
</Section> </Section>
<Section Name="Dogwood"> <Section Name="Dogwood">
<Key Name="assetID" Value="64367bd1-697e-b3e6-0b65-3f862a577366"/> <Key Name="assetID" Value="64367bd1-697e-b3e6-0b65-3f862a577366"/>
<Key Name="name" Value="Dogwood"/> <Key Name="name" Value="Dogwood"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="64367bd1-697e-b3e6-0b65-3f862a577366.j2c" /> <Key Name="fileName" Value="64367bd1-697e-b3e6-0b65-3f862a577366.j2c" />
</Section> </Section>
<Section Name="Eelgrass"> <Section Name="Eelgrass">
<Key Name="assetID" Value="96b4de31-f4fa-337d-ec78-451e3609769e"/> <Key Name="assetID" Value="96b4de31-f4fa-337d-ec78-451e3609769e"/>
<Key Name="name" Value="Eelgrass"/> <Key Name="name" Value="Eelgrass"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="96b4de31-f4fa-337d-ec78-451e3609769e.j2c" /> <Key Name="fileName" Value="96b4de31-f4fa-337d-ec78-451e3609769e.j2c" />
</Section> </Section>
<Section Name="Eucalyptus"> <Section Name="Eucalyptus">
<Key Name="assetID" Value="a6162133-724b-54df-a12f-51cd070ad6f3"/> <Key Name="assetID" Value="a6162133-724b-54df-a12f-51cd070ad6f3"/>
<Key Name="name" Value="Eucalyptus"/> <Key Name="name" Value="Eucalyptus"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="a6162133-724b-54df-a12f-51cd070ad6f3.j2c" /> <Key Name="fileName" Value="a6162133-724b-54df-a12f-51cd070ad6f3.j2c" />
</Section> </Section>
<Section Name="Fern"> <Section Name="Fern">
<Key Name="assetID" Value="8872f2b8-31db-42d8-580a-b3e4a91262de"/> <Key Name="assetID" Value="8872f2b8-31db-42d8-580a-b3e4a91262de"/>
<Key Name="name" Value="Fern"/> <Key Name="name" Value="Fern"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="8872f2b8-31db-42d8-580a-b3e4a91262de.j2c" /> <Key Name="fileName" Value="8872f2b8-31db-42d8-580a-b3e4a91262de.j2c" />
</Section> </Section>
<Section Name="Kelp 1"> <Section Name="Kelp 1">
<Key Name="assetID" Value="2caf1179-7861-6ff3-4b7d-46e17780bdfa"/> <Key Name="assetID" Value="2caf1179-7861-6ff3-4b7d-46e17780bdfa"/>
<Key Name="name" Value="Kelp 1"/> <Key Name="name" Value="Kelp 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c" /> <Key Name="fileName" Value="2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c" />
</Section> </Section>
<Section Name="Kelp 2"> <Section Name="Kelp 2">
<Key Name="assetID" Value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f"/> <Key Name="assetID" Value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f"/>
<Key Name="name" Value="Kelp 2"/> <Key Name="name" Value="Kelp 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c" /> <Key Name="fileName" Value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c" />
</Section> </Section>
<Section Name="Oak"> <Section Name="Oak">
<Key Name="assetID" Value="8a515889-eac9-fb55-8eba-d2dc09eb32c8"/> <Key Name="assetID" Value="8a515889-eac9-fb55-8eba-d2dc09eb32c8"/>
<Key Name="name" Value="Oak"/> <Key Name="name" Value="Oak"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c" /> <Key Name="fileName" Value="8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c" />
</Section> </Section>
<Section Name="Palm 1"> <Section Name="Palm 1">
<Key Name="assetID" Value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c"/> <Key Name="assetID" Value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c"/>
<Key Name="name" Value="Palm 1"/> <Key Name="name" Value="Palm 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c" /> <Key Name="fileName" Value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c" />
</Section> </Section>
<Section Name="Palm 2"> <Section Name="Palm 2">
<Key Name="assetID" Value="2d784476-d0db-9979-0cff-9408745a7cf3"/> <Key Name="assetID" Value="2d784476-d0db-9979-0cff-9408745a7cf3"/>
<Key Name="name" Value="Palm 2"/> <Key Name="name" Value="Palm 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="2d784476-d0db-9979-0cff-9408745a7cf3.j2c" /> <Key Name="fileName" Value="2d784476-d0db-9979-0cff-9408745a7cf3.j2c" />
</Section> </Section>
<Section Name="Pine 1"> <Section Name="Pine 1">
<Key Name="assetID" Value="0187babf-6c0d-5891-ebed-4ecab1426683"/> <Key Name="assetID" Value="0187babf-6c0d-5891-ebed-4ecab1426683"/>
<Key Name="name" Value="Pine 1"/> <Key Name="name" Value="Pine 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="0187babf-6c0d-5891-ebed-4ecab1426683.j2c" /> <Key Name="fileName" Value="0187babf-6c0d-5891-ebed-4ecab1426683.j2c" />
</Section> </Section>
<Section Name="Pine 2"> <Section Name="Pine 2">
<Key Name="assetID" Value="d691a01c-13b7-578d-57c0-5caef0b4e7e1"/> <Key Name="assetID" Value="d691a01c-13b7-578d-57c0-5caef0b4e7e1"/>
<Key Name="name" Value="Pine 2"/> <Key Name="name" Value="Pine 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c" /> <Key Name="fileName" Value="d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c" />
</Section> </Section>
<Section Name="Plumeria"> <Section Name="Plumeria">
<Key Name="assetID" Value="6de37e4e-7029-61f5-54b8-f5e63f983f58"/> <Key Name="assetID" Value="6de37e4e-7029-61f5-54b8-f5e63f983f58"/>
<Key Name="name" Value="Plumeria"/> <Key Name="name" Value="Plumeria"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c" /> <Key Name="fileName" Value="6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c" />
</Section> </Section>
<Section Name="Sea Sword"> <Section Name="Sea Sword">
<Key Name="assetID" Value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3"/> <Key Name="assetID" Value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3"/>
<Key Name="name" Value="Sea Sword"/> <Key Name="name" Value="Sea Sword"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c" /> <Key Name="fileName" Value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c" />
</Section> </Section>
<Section Name="Tropical Bush 1"> <Section Name="Tropical Bush 1">
<Key Name="assetID" Value="5bc11cd6-2f40-071e-a8da-0903394204f9"/> <Key Name="assetID" Value="5bc11cd6-2f40-071e-a8da-0903394204f9"/>
<Key Name="name" Value="Tropical Bush 1"/> <Key Name="name" Value="Tropical Bush 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="5bc11cd6-2f40-071e-a8da-0903394204f9.j2c" /> <Key Name="fileName" Value="5bc11cd6-2f40-071e-a8da-0903394204f9.j2c" />
</Section> </Section>
<Section Name="Tropical Bush 2"> <Section Name="Tropical Bush 2">
<Key Name="assetID" Value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8"/> <Key Name="assetID" Value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8"/>
<Key Name="name" Value="Tropical Bush 2"/> <Key Name="name" Value="Tropical Bush 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c" /> <Key Name="fileName" Value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c" />
</Section> </Section>
<Section Name="Winter Pine 1"> <Section Name="Winter Pine 1">
<Key Name="assetID" Value="10d2a01a-0818-84b9-4b96-c2eb63256519"/> <Key Name="assetID" Value="10d2a01a-0818-84b9-4b96-c2eb63256519"/>
<Key Name="name" Value="Winter Pine 1"/> <Key Name="name" Value="Winter Pine 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="10d2a01a-0818-84b9-4b96-c2eb63256519.j2c" /> <Key Name="fileName" Value="10d2a01a-0818-84b9-4b96-c2eb63256519.j2c" />
</Section> </Section>
<Section Name="Winter Pine 2"> <Section Name="Winter Pine 2">
<Key Name="assetID" Value="67931331-0c02-4876-1255-28770896c6a2"/> <Key Name="assetID" Value="67931331-0c02-4876-1255-28770896c6a2"/>
<Key Name="name" Value="Winter Pine 2"/> <Key Name="name" Value="Winter Pine 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="67931331-0c02-4876-1255-28770896c6a2.j2c" /> <Key Name="fileName" Value="67931331-0c02-4876-1255-28770896c6a2.j2c" />
</Section> </Section>
<Section Name="Winter Aspen"> <Section Name="Winter Aspen">
<Key Name="assetID" Value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a"/> <Key Name="assetID" Value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a"/>
<Key Name="name" Value="Winter Aspen"/> <Key Name="name" Value="Winter Aspen"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c" /> <Key Name="fileName" Value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c" />
</Section> </Section>
<Section Name="Grass 0"> <Section Name="Grass 0">
<Key Name="assetID" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/> <Key Name="assetID" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/>
<Key Name="name" Value="Grass 0"/> <Key Name="name" Value="Grass 0"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c" /> <Key Name="fileName" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c" />
</Section> </Section>
<Section Name="Grass 1"> <Section Name="Grass 1">
<Key Name="assetID" Value="79504bf5-c3ec-0763-6563-d843de66d0a1"/> <Key Name="assetID" Value="79504bf5-c3ec-0763-6563-d843de66d0a1"/>
<Key Name="name" Value="Grass 1"/> <Key Name="name" Value="Grass 1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="79504bf5-c3ec-0763-6563-d843de66d0a1.j2c" /> <Key Name="fileName" Value="79504bf5-c3ec-0763-6563-d843de66d0a1.j2c" />
</Section> </Section>
<Section Name="Grass 2"> <Section Name="Grass 2">
<Key Name="assetID" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/> <Key Name="assetID" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/>
<Key Name="name" Value="Grass 2"/> <Key Name="name" Value="Grass 2"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c" /> <Key Name="fileName" Value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c" />
</Section> </Section>
<Section Name="Grass 3"> <Section Name="Grass 3">
<Key Name="assetID" Value="99bd60a2-3250-efc9-2e39-2fbcadefbecc"/> <Key Name="assetID" Value="99bd60a2-3250-efc9-2e39-2fbcadefbecc"/>
<Key Name="name" Value="Grass 3"/> <Key Name="name" Value="Grass 3"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c" /> <Key Name="fileName" Value="99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c" />
</Section> </Section>
<Section Name="Grass 4"> <Section Name="Grass 4">
<Key Name="assetID" Value="7a2b3a4a-53c2-53ac-5716-aac7d743c020"/> <Key Name="assetID" Value="7a2b3a4a-53c2-53ac-5716-aac7d743c020"/>
<Key Name="name" Value="Grass 4"/> <Key Name="name" Value="Grass 4"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c" /> <Key Name="fileName" Value="7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c" />
</Section> </Section>
<Section Name="undergrowth_1"> <Section Name="undergrowth_1">
<Key Name="assetID" Value="8f458549-173b-23ff-d4ff-bfaa5ea2371b"/> <Key Name="assetID" Value="8f458549-173b-23ff-d4ff-bfaa5ea2371b"/>
<Key Name="name" Value="undergrowth_1"/> <Key Name="name" Value="undergrowth_1"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c" /> <Key Name="fileName" Value="8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c" />
</Section> </Section>
<Section Name="texture_crosshair"> <Section Name="texture_crosshair">
<Key Name="assetID" Value="a85ac674-cb75-4af6-9499-df7c5aaf7a28"/> <Key Name="assetID" Value="a85ac674-cb75-4af6-9499-df7c5aaf7a28"/>
<Key Name="name" Value="texture_crosshair"/> <Key Name="name" Value="texture_crosshair"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c" /> <Key Name="fileName" Value="a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c" />
</Section> </Section>
<Section Name="viewer_water"> <Section Name="viewer_water">
<Key Name="assetID" Value="822ded49-9a6c-f61c-cb89-6df54f42cdf4"/> <Key Name="assetID" Value="822ded49-9a6c-f61c-cb89-6df54f42cdf4"/>
<Key Name="name" Value="viewer_water"/> <Key Name="name" Value="viewer_water"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c" /> <Key Name="fileName" Value="822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c" />
</Section> </Section>
<Section Name="woodgrain_bumpmap"> <Section Name="woodgrain_bumpmap">
<Key Name="assetID" Value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc"/> <Key Name="assetID" Value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc"/>
<Key Name="name" Value="woodgrain_bumpmap"/> <Key Name="name" Value="woodgrain_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c" /> <Key Name="fileName" Value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c" />
</Section> </Section>
<Section Name="bark_bumpmap"> <Section Name="bark_bumpmap">
<Key Name="assetID" Value="6c9fa78a-1c69-2168-325b-3e03ffa348ce"/> <Key Name="assetID" Value="6c9fa78a-1c69-2168-325b-3e03ffa348ce"/>
<Key Name="name" Value="bark_bumpmap"/> <Key Name="name" Value="bark_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c" /> <Key Name="fileName" Value="6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c" />
</Section> </Section>
<Section Name="bricks_bumpmap"> <Section Name="bricks_bumpmap">
<Key Name="assetID" Value="b8eed5f0-64b7-6e12-b67f-43fa8e773440"/> <Key Name="assetID" Value="b8eed5f0-64b7-6e12-b67f-43fa8e773440"/>
<Key Name="name" Value="bricks_bumpmap"/> <Key Name="name" Value="bricks_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c" /> <Key Name="fileName" Value="b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c" />
</Section> </Section>
<Section Name="checker_bumpmap"> <Section Name="checker_bumpmap">
<Key Name="assetID" Value="9deab416-9c63-78d6-d558-9a156f12044c"/> <Key Name="assetID" Value="9deab416-9c63-78d6-d558-9a156f12044c"/>
<Key Name="name" Value="checker_bumpmap"/> <Key Name="name" Value="checker_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="9deab416-9c63-78d6-d558-9a156f12044c.j2c" /> <Key Name="fileName" Value="9deab416-9c63-78d6-d558-9a156f12044c.j2c" />
</Section> </Section>
<Section Name="concrete_bumpmap"> <Section Name="concrete_bumpmap">
<Key Name="assetID" Value="db9d39ec-a896-c287-1ced-64566217021e"/> <Key Name="assetID" Value="db9d39ec-a896-c287-1ced-64566217021e"/>
<Key Name="name" Value="concrete_bumpmap"/> <Key Name="name" Value="concrete_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="db9d39ec-a896-c287-1ced-64566217021e.j2c" /> <Key Name="fileName" Value="db9d39ec-a896-c287-1ced-64566217021e.j2c" />
</Section> </Section>
<Section Name="crustytile_bumpmap"> <Section Name="crustytile_bumpmap">
<Key Name="assetID" Value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94"/> <Key Name="assetID" Value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94"/>
<Key Name="name" Value="crustytile_bumpmap"/> <Key Name="name" Value="crustytile_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c" /> <Key Name="fileName" Value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c" />
</Section> </Section>
<Section Name="cutstone_bumpmap"> <Section Name="cutstone_bumpmap">
<Key Name="assetID" Value="d9258671-868f-7511-c321-7baef9e948a4"/> <Key Name="assetID" Value="d9258671-868f-7511-c321-7baef9e948a4"/>
<Key Name="name" Value="cutstone_bumpmap"/> <Key Name="name" Value="cutstone_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="d9258671-868f-7511-c321-7baef9e948a4.j2c" /> <Key Name="fileName" Value="d9258671-868f-7511-c321-7baef9e948a4.j2c" />
</Section> </Section>
<Section Name="discs_bumpmap"> <Section Name="discs_bumpmap">
<Key Name="assetID" Value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9"/> <Key Name="assetID" Value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9"/>
<Key Name="name" Value="discs_bumpmap"/> <Key Name="name" Value="discs_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c" /> <Key Name="fileName" Value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c" />
</Section> </Section>
<Section Name="gravel_bumpmap"> <Section Name="gravel_bumpmap">
<Key Name="assetID" Value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61"/> <Key Name="assetID" Value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61"/>
<Key Name="name" Value="gravel_bumpmap"/> <Key Name="name" Value="gravel_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c" /> <Key Name="fileName" Value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c" />
</Section> </Section>
<Section Name="petridish_bumpmap"> <Section Name="petridish_bumpmap">
<Key Name="assetID" Value="e569711a-27c2-aad4-9246-0c910239a179"/> <Key Name="assetID" Value="e569711a-27c2-aad4-9246-0c910239a179"/>
<Key Name="name" Value="petridish_bumpmap"/> <Key Name="name" Value="petridish_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="e569711a-27c2-aad4-9246-0c910239a179.j2c" /> <Key Name="fileName" Value="e569711a-27c2-aad4-9246-0c910239a179.j2c" />
</Section> </Section>
<Section Name="siding_bumpmap"> <Section Name="siding_bumpmap">
<Key Name="assetID" Value="073c9723-540c-5449-cdd4-0e87fdc159e3"/> <Key Name="assetID" Value="073c9723-540c-5449-cdd4-0e87fdc159e3"/>
<Key Name="name" Value="siding_bumpmap"/> <Key Name="name" Value="siding_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="073c9723-540c-5449-cdd4-0e87fdc159e3.j2c" /> <Key Name="fileName" Value="073c9723-540c-5449-cdd4-0e87fdc159e3.j2c" />
</Section> </Section>
<Section Name="stonetile_bumpmap"> <Section Name="stonetile_bumpmap">
<Key Name="assetID" Value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0"/> <Key Name="assetID" Value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0"/>
<Key Name="name" Value="stonetile_bumpmap"/> <Key Name="name" Value="stonetile_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c" /> <Key Name="fileName" Value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c" />
</Section> </Section>
<Section Name="stucco_bumpmap"> <Section Name="stucco_bumpmap">
<Key Name="assetID" Value="92e66e00-f56f-598a-7997-048aa64cde18"/> <Key Name="assetID" Value="92e66e00-f56f-598a-7997-048aa64cde18"/>
<Key Name="name" Value="stucco_bumpmap"/> <Key Name="name" Value="stucco_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="92e66e00-f56f-598a-7997-048aa64cde18.j2c" /> <Key Name="fileName" Value="92e66e00-f56f-598a-7997-048aa64cde18.j2c" />
</Section> </Section>
<Section Name="suction_bumpmap"> <Section Name="suction_bumpmap">
<Key Name="assetID" Value="83b77fc6-10b4-63ec-4de7-f40629f238c5"/> <Key Name="assetID" Value="83b77fc6-10b4-63ec-4de7-f40629f238c5"/>
<Key Name="name" Value="suction_bumpmap"/> <Key Name="name" Value="suction_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c" /> <Key Name="fileName" Value="83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c" />
</Section> </Section>
<Section Name="weave_bumpmap"> <Section Name="weave_bumpmap">
<Key Name="assetID" Value="735198cf-6ea0-2550-e222-21d3c6a341ae"/> <Key Name="assetID" Value="735198cf-6ea0-2550-e222-21d3c6a341ae"/>
<Key Name="name" Value="weave_bumpmap"/> <Key Name="name" Value="weave_bumpmap"/>
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" /> <Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" />
</Section> </Section>
</Nini> </Nini>

40
bin/assets/TexturesAssetSet/licenses.txt
View File

@ -36,24 +36,24 @@ A few of the wood textures were created by me using Wood Workshop. These I donat
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. 6. From Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc.
Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
artwork and other works in the files distributed with this Notice under artwork and other works in the files distributed with this Notice under
the Creative Commons Attribution-Share Alike 3.0 License, available at the Creative Commons Attribution-Share Alike 3.0 License, available at
http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license http://creativecommons.org/licenses/by- sa/3.0/legalcode. For the license
summary, see http://creativecommons.org/licenses/by-sa/3.0/. summary, see http://creativecommons.org/licenses/by-sa/3.0/.
Notwithstanding the foregoing, all of Linden Lab's trademarks, including Notwithstanding the foregoing, all of Linden Lab's trademarks, including
but not limited to the Second Life brand name and Second Life Eye-in-Hand but not limited to the Second Life brand name and Second Life Eye-in-Hand
logo, are subject to our trademark policy at logo, are subject to our trademark policy at
http://secondlife.com/corporate/trademark/. http://secondlife.com/corporate/trademark/.
If you distribute any copies or adaptations of the Second Life viewer If you distribute any copies or adaptations of the Second Life viewer
artwork or any other works in these files, you must include this Notice artwork or any other works in these files, you must include this Notice
and clearly identify any changes made to the original works. Include and clearly identify any changes made to the original works. Include
this Notice and information where copyright notices are usually included, this Notice and information where copyright notices are usually included,
for example, after your own copyright notice acknowledging your use of for example, after your own copyright notice acknowledging your use of
the Second Life viewer artwork, in a text file distributed with your the Second Life viewer artwork, in a text file distributed with your
program, in your application's About window, or on a credits page for program, in your application's About window, or on a credits page for
your work. your work.