Update svn properties. Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-25 23:27:38 +00:00
parent c20f7d6171
commit 5d77625e9a
44 changed files with 403 additions and 400 deletions

View File

@ -23,7 +23,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
using System; using System;

View File

@ -23,7 +23,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
using System; using System;

View File

@ -23,7 +23,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
using libsecondlife; using libsecondlife;

View File

@ -23,7 +23,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
using System; using System;

View File

@ -23,7 +23,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
using System; using System;

View File

@ -95,7 +95,9 @@ namespace OpenSim.Data.MySQL
settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";";
database = new MySQLManager(m_connectString); database = new MySQLManager(m_connectString);
} else { }
else
{
m_connectString = connect; m_connectString = connect;
m_agentsTableName = "agents"; m_agentsTableName = "agents";
m_usersTableName = "users"; m_usersTableName = "users";

View File

@ -119,7 +119,9 @@ namespace OpenSim.Grid.UserServer
RegionProfileData.RequestSimProfileData( RegionProfileData.RequestSimProfileData(
theUser.HomeRegion, m_config.GridServerURL, theUser.HomeRegion, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey); m_config.GridSendKey, m_config.GridRecvKey);
} else { }
else
{
start_x = Convert.ToInt32(startLocationRequestParsed[1]); start_x = Convert.ToInt32(startLocationRequestParsed[1]);
start_y = Convert.ToInt32(startLocationRequestParsed[2]); start_y = Convert.ToInt32(startLocationRequestParsed[2]);
start_z = Convert.ToInt32(startLocationRequestParsed[3]); start_z = Convert.ToInt32(startLocationRequestParsed[3]);

View File

@ -260,11 +260,14 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("owner")) if (requestData.Contains("owner"))
{ {
appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); appearance = GetUserAppearance(new LLUUID((string)requestData["owner"]));
if (appearance == null) { if (appearance == null)
{
responseData = new Hashtable(); responseData = new Hashtable();
responseData["error_type"] = "no appearance"; responseData["error_type"] = "no appearance";
responseData["error_desc"] = "There was no appearance found for this avatar"; responseData["error_desc"] = "There was no appearance found for this avatar";
} else { }
else
{
responseData = appearance.ToHashTable(); responseData = appearance.ToHashTable();
} }
} }

View File

@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>(); private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>();
/* protected variables */ /* protected variables */
protected static Dictionary<PacketType, PacketMethod> PacketHandlers = protected static Dictionary<PacketType, PacketMethod> PacketHandlers =
@ -413,7 +412,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Thread.Sleep(2000); Thread.Sleep(2000);
// Shut down timers // Shut down timers
m_ackTimer.Stop(); m_ackTimer.Stop();
m_clientPingTimer.Stop(); m_clientPingTimer.Stop();
@ -782,7 +780,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event TeleportLocationRequest OnSetStartLocationRequest; public event TeleportLocationRequest OnSetStartLocationRequest;
public event UpdateAvatarProperties OnUpdateAvatarProperties; public event UpdateAvatarProperties OnUpdateAvatarProperties;
public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateNewInventoryItem OnCreateNewInventoryItem;
public event CreateInventoryFolder OnCreateNewInventoryFolder; public event CreateInventoryFolder OnCreateNewInventoryFolder;
public event UpdateInventoryFolder OnUpdateInventoryFolder; public event UpdateInventoryFolder OnUpdateInventoryFolder;

View File

@ -1403,10 +1403,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="remoteAvatar"></param> /// <param name="remoteAvatar"></param>
public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
{ {
if(remoteAvatar == null) if (remoteAvatar == null || remoteAvatar.ControllingClient == null)
return;
IClientAPI rc=remoteAvatar.ControllingClient;
if(rc == null)
return; return;
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,

View File

@ -3298,8 +3298,11 @@ namespace OpenSim.Region.ScriptEngine.Common
result.Add(src.Substring(start,length).Trim()); result.Add(src.Substring(start,length).Trim());
start += length+1; start += length+1;
length = 0; length = 0;
} else }
else
{
length++; length++;
}
break; break;
default : default :
length++; length++;
@ -5301,7 +5304,8 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
// not present at all // not present at all
active[j] = false; active[j] = false;
} else }
else
{ {
// present and correct // present and correct
if (offset[j] < offset[best]) if (offset[j] < offset[best])
@ -5332,7 +5336,8 @@ namespace OpenSim.Region.ScriptEngine.Common
if (best < seplen) if (best < seplen)
{ {
beginning = offset[best]+((string)separray[best]).Length; beginning = offset[best]+((string)separray[best]).Length;
} else }
else
{ {
beginning = offset[best]+((string)spcarray[best-seplen]).Length; beginning = offset[best]+((string)spcarray[best-seplen]).Length;
tokens.Add(spcarray[best-seplen]); tokens.Add(spcarray[best-seplen]);

View File

@ -100,7 +100,9 @@ namespace OpenSim.GUI
} }
} }
e.Handled = true; e.Handled = true;
} else { }
else
{
InHistory = false; InHistory = false;
HistoryPosition = -1; HistoryPosition = -1;
} }