diff options
| author | UbitUmarov | 2017-05-23 07:35:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-23 07:35:02 +0100 |
| commit | c0bfaac0ac6873720b7c3721436ca54e93d5072c (patch) | |
| tree | 62f6b02569ba6dd968d76ad9bf2aa6ccf839d588 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | reenqueue poll events while conn is open, and not expired (diff) | |
| parent | dont log timeouts on stopped threads (diff) | |
| download | opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.zip opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.gz opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.bz2 opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.xz | |
merge master
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 474378d..55ccb0a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4687,7 +4687,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4687 | cAgent.agentCOF = COF; | 4687 | cAgent.agentCOF = COF; |
| 4688 | cAgent.ActiveGroupID = ControllingClient.ActiveGroupId; | 4688 | cAgent.ActiveGroupID = ControllingClient.ActiveGroupId; |
| 4689 | cAgent.ActiveGroupName = ControllingClient.ActiveGroupName; | 4689 | cAgent.ActiveGroupName = ControllingClient.ActiveGroupName; |
| 4690 | cAgent.ActiveGroupTitle = Grouptitle; | 4690 | if(Grouptitle == null) |
| 4691 | cAgent.ActiveGroupTitle = String.Empty; | ||
| 4692 | else | ||
| 4693 | cAgent.ActiveGroupTitle = Grouptitle; | ||
| 4691 | } | 4694 | } |
| 4692 | } | 4695 | } |
| 4693 | 4696 | ||