aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2011-06-20 03:08:56 +0200
committerMelanie2011-06-20 03:08:56 +0200
commitf4f55c4d6bdbe9a86b5343159916977b331fefe0 (patch)
tree08fb85f2aa0193bf8549e684b98501c2c52faa1a /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentAdd some flags to control content in search better (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.zip
opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.gz
opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.bz2
opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index c0236f4..39d4a29 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1584,7 +1584,7 @@ namespace OpenSim.Region.Framework.Scenes
1584 } 1584 }
1585 1585
1586 /// <summary> 1586 /// <summary>
1587 /// 1587 /// Handle a prim description set request from a viewer.
1588 /// </summary> 1588 /// </summary>
1589 /// <param name="primLocalID"></param> 1589 /// <param name="primLocalID"></param>
1590 /// <param name="description"></param> 1590 /// <param name="description"></param>
@@ -1601,8 +1601,17 @@ namespace OpenSim.Region.Framework.Scenes
1601 } 1601 }
1602 } 1602 }
1603 1603
1604 /// <summary>
1605 /// Set a click action for the prim.
1606 /// </summary>
1607 /// <param name="remoteClient"></param>
1608 /// <param name="primLocalID"></param>
1609 /// <param name="clickAction"></param>
1604 protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction) 1610 protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction)
1605 { 1611 {
1612// m_log.DebugFormat(
1613// "[SCENEGRAPH]: User {0} set click action for {1} to {2}", remoteClient.Name, primLocalID, clickAction);
1614
1606 SceneObjectGroup group = GetGroupByPrim(primLocalID); 1615 SceneObjectGroup group = GetGroupByPrim(primLocalID);
1607 if (group != null) 1616 if (group != null)
1608 { 1617 {