From b71952df49784167a4c2eed218424064b90bfd63 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 19 Nov 2013 23:36:44 +0000
Subject: [PATCH] Stop AgentCircuitData.Viewer.get() from throwing an error if
 no Viewer has been set.

Continue to return null instead.
---
 OpenSim/Framework/AgentCircuitData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index acf925a408..51f0a1e4b8 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
             get
             {
                 // Old style version string contains viewer name followed by a space followed by a version number
-                if (ViewerInternal.Contains(" "))
+                if (ViewerInternal == null || ViewerInternal.Contains(" "))
                 {
                     return ViewerInternal;
                 }