aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-19 23:36:44 +0000
committerJustin Clark-Casey (justincc)2013-11-19 23:36:44 +0000
commitb71952df49784167a4c2eed218424064b90bfd63 (patch)
tree94cd100139f2cc7561ae4d62ce42e2c4fb72606e /OpenSim/Framework
parentNormalize viewer version string to accomodate new style version reporting in ... (diff)
downloadopensim-SC_OLD-b71952df49784167a4c2eed218424064b90bfd63.zip
opensim-SC_OLD-b71952df49784167a4c2eed218424064b90bfd63.tar.gz
opensim-SC_OLD-b71952df49784167a4c2eed218424064b90bfd63.tar.bz2
opensim-SC_OLD-b71952df49784167a4c2eed218424064b90bfd63.tar.xz
Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has been set.
Continue to return null instead.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index acf925a..51f0a1e 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
142 get 142 get
143 { 143 {
144 // Old style version string contains viewer name followed by a space followed by a version number 144 // Old style version string contains viewer name followed by a space followed by a version number
145 if (ViewerInternal.Contains(" ")) 145 if (ViewerInternal == null || ViewerInternal.Contains(" "))
146 { 146 {
147 return ViewerInternal; 147 return ViewerInternal;
148 } 148 }