diff options
| author | UbitUmarov | 2015-09-12 06:10:52 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-12 06:10:52 +0100 |
| commit | 118aff520efba90bc9f8c767beaf5378a92b1939 (patch) | |
| tree | ab70d2346fa7b2164bdfb75278e51ec4bb21ed18 /OpenSim/Region/ClientStack | |
| parent | fix the typos that seem to matter so much to some :p (diff) | |
| download | opensim-SC_OLD-118aff520efba90bc9f8c767beaf5378a92b1939.zip opensim-SC_OLD-118aff520efba90bc9f8c767beaf5378a92b1939.tar.gz opensim-SC_OLD-118aff520efba90bc9f8c767beaf5378a92b1939.tar.bz2 opensim-SC_OLD-118aff520efba90bc9f8c767beaf5378a92b1939.tar.xz | |
try to better merge avn and os fetchinventory and fetchinvdescendents
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 2a252e1..1a19c1b 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
| @@ -93,7 +93,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 93 | private bool m_Enabled; | 93 | private bool m_Enabled; |
| 94 | 94 | ||
| 95 | private string m_fetchInventoryDescendents2Url; | 95 | private string m_fetchInventoryDescendents2Url; |
| 96 | private string m_webFetchInventoryDescendentsUrl; | 96 | // private string m_webFetchInventoryDescendentsUrl; |
| 97 | 97 | ||
| 98 | private static FetchInvDescHandler m_webFetchHandler; | 98 | private static FetchInvDescHandler m_webFetchHandler; |
| 99 | 99 | ||
| @@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 121 | // m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty); | 121 | // m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty); |
| 122 | 122 | ||
| 123 | // if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty) | 123 | // if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty) |
| 124 | if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty) | 124 | if (m_fetchInventoryDescendents2Url != string.Empty) |
| 125 | { | 125 | { |
| 126 | m_Enabled = true; | 126 | m_Enabled = true; |
| 127 | } | 127 | } |