aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-12-01 16:10:15 -0800
committeropensim mirror account2010-12-01 16:10:15 -0800
commit6f3fbca5a35139d97ce72f2aea1d17698086a152 (patch)
tree8e6573648f7bc9391f645ed05fa3449192a4d93e
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentAdded some comments. Better than listening to the boring speaker... (diff)
downloadopensim-SC_OLD-6f3fbca5a35139d97ce72f2aea1d17698086a152.zip
opensim-SC_OLD-6f3fbca5a35139d97ce72f2aea1d17698086a152.tar.gz
opensim-SC_OLD-6f3fbca5a35139d97ce72f2aea1d17698086a152.tar.bz2
opensim-SC_OLD-6f3fbca5a35139d97ce72f2aea1d17698086a152.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
-rw-r--r--OpenSim/Services/HypergridService/HGAssetService.cs5
-rw-r--r--OpenSim/Services/HypergridService/HGInventoryService.cs7
4 files changed, 28 insertions, 1 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 5c0630c..6e8c2ee 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -34,8 +34,20 @@ using OpenSim.Services.Interfaces;
34 34
35namespace OpenSim.Framework.Serialization.External 35namespace OpenSim.Framework.Serialization.External
36{ 36{
37 /// <summary>
38 /// Utilities for manipulating external representations of data structures in OpenSim
39 /// </summary>
37 public class ExternalRepresentationUtils 40 public class ExternalRepresentationUtils
38 { 41 {
42 /// <summary>
43 /// Takes a XML representation of a SceneObjectPart and returns another XML representation
44 /// with creator data added to it.
45 /// </summary>
46 /// <param name="xml">The SceneObjectPart represented in XML2</param>
47 /// <param name="profileURL">The URL of the profile service for the creator</param>
48 /// <param name="userService">The service for retrieving user account information</param>
49 /// <param name="scopeID">The scope of the user account information (Grid ID)</param>
50 /// <returns>The SceneObjectPart represented in XML2</returns>
39 public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID) 51 public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID)
40 { 52 {
41 if (xml == string.Empty || profileURL == string.Empty || userService == null) 53 if (xml == string.Empty || profileURL == string.Empty || userService == null)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ba592c4..f87056e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -449,7 +449,10 @@ namespace OpenSim.Region.Framework.Scenes
449 } 449 }
450 } 450 }
451 451
452 public string CreatorData // = <profile url>;<name> 452 /// <summary>
453 /// Data about the creator in the form profile_url;name
454 /// </summary>
455 public string CreatorData
453 { 456 {
454 get { return m_creatorData; } 457 get { return m_creatorData; }
455 set { m_creatorData = value; } 458 set { m_creatorData = value; }
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index 584ab6f..a82d0d1 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -42,6 +42,11 @@ using OpenSim.Services.AssetService;
42 42
43namespace OpenSim.Services.HypergridService 43namespace OpenSim.Services.HypergridService
44{ 44{
45 /// <summary>
46 /// Hypergrid asset service. It serves the IAssetService interface,
47 /// but implements it in ways that are appropriate for inter-grid
48 /// asset exchanges.
49 /// </summary>
45 public class HGAssetService : OpenSim.Services.AssetService.AssetService, IAssetService 50 public class HGAssetService : OpenSim.Services.AssetService.AssetService, IAssetService
46 { 51 {
47 private static readonly ILog m_log = 52 private static readonly ILog m_log =
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index a04f0c4..9ee1ae4 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -40,6 +40,13 @@ using OpenSim.Server.Base;
40 40
41namespace OpenSim.Services.HypergridService 41namespace OpenSim.Services.HypergridService
42{ 42{
43 /// <summary>
44 /// Hypergrid inventory service. It serves the IInventoryService interface,
45 /// but implements it in ways that are appropriate for inter-grid
46 /// inventory exchanges. Specifically, it does not performs deletions
47 /// and it responds to GetRootFolder requests with the ID of the
48 /// Suitcase folder, not the actual "My Inventory" folder.
49 /// </summary>
43 public class HGInventoryService : XInventoryService, IInventoryService 50 public class HGInventoryService : XInventoryService, IInventoryService
44 { 51 {
45 private static readonly ILog m_log = 52 private static readonly ILog m_log =