diff options
| author | MW | 2007-07-22 13:41:19 +0000 |
|---|---|---|
| committer | MW | 2007-07-22 13:41:19 +0000 |
| commit | 5db16cbd9b062976ff519a41dc756c4aea6c5b02 (patch) | |
| tree | 31681803ca9574609d4082e73672e396532792ae /OpenSim | |
| parent | Think I've recovered my deleted files, so hopefully it works now. (diff) | |
| download | opensim-SC-5db16cbd9b062976ff519a41dc756c4aea6c5b02.zip opensim-SC-5db16cbd9b062976ff519a41dc756c4aea6c5b02.tar.gz opensim-SC-5db16cbd9b062976ff519a41dc756c4aea6c5b02.tar.bz2 opensim-SC-5db16cbd9b062976ff519a41dc756c4aea6c5b02.tar.xz | |
Couple of small changes
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactions.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index bb9c069..6741969 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |||
| @@ -85,7 +85,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
| 85 | private string m_assetName = ""; | 85 | private string m_assetName = ""; |
| 86 | private LLUUID m_folderID; | 86 | private LLUUID m_folderID; |
| 87 | private LLUUID newAssetID; | 87 | private LLUUID newAssetID; |
| 88 | private bool SaveImages; | 88 | private bool SaveImages = false; |
| 89 | private string uploaderPath = ""; | 89 | private string uploaderPath = ""; |
| 90 | 90 | ||
| 91 | // Events | 91 | // Events |
| @@ -226,7 +226,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
| 226 | private LLUUID inventoryItemID; | 226 | private LLUUID inventoryItemID; |
| 227 | private string m_assetName = ""; | 227 | private string m_assetName = ""; |
| 228 | private LLUUID newAssetID; | 228 | private LLUUID newAssetID; |
| 229 | private bool SaveImages; | 229 | private bool SaveImages = false; |
| 230 | private string uploaderPath = ""; | 230 | private string uploaderPath = ""; |
| 231 | 231 | ||
| 232 | // Events | 232 | // Events |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 518a53f..16b8b4c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 550 | m_estateManager.sendRegionHandshake(client); | 550 | m_estateManager.sendRegionHandshake(client); |
| 551 | CreateAndAddScenePresence(client); | 551 | CreateAndAddScenePresence(client); |
| 552 | m_LandManager.sendParcelOverlay(client); | 552 | m_LandManager.sendParcelOverlay(client); |
| 553 | commsManager.UserProfilesCache.AddNewUser(client.AgentId); | 553 | // commsManager.UserProfilesCache.AddNewUser(client.AgentId); |
| 554 | } | 554 | } |
| 555 | 555 | ||
| 556 | protected virtual void SubscribeToClientEvents(IClientAPI client) | 556 | protected virtual void SubscribeToClientEvents(IClientAPI client) |