[Ogoglio-commits] SF.net SVN: ogoglio: [534] maven/trunk/ogoglio-common/src/main/java/com/ ogoglio/client

[<tre...@us...>]

Revision: 534
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=534&view=rev
Author:   trevorolio
Date:     2007-10-22 04:43:45 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Added a /help command which lists camera controls.
Fixed a sitting bug when switching straight from one seat to another.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java	2007-10-22 10:58:49 UTC (rev 533)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java	2007-10-22 11:43:45 UTC (rev 534)
@@ -493,7 +493,7 @@
                 if (accountDoc.getUsername().equals(event.getStringProperty(SpaceEvent.USERNAME))) {
                     return;
                 }
-
+                System.out.println(event);
                 User user = space.getUser(event.getStringProperty(SpaceEvent.USERNAME));
                 if (user == null) {
                     Log.error("Got a sit event for an unknown user: " + event.getStringProperty(SpaceEvent.USERNAME));

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java	2007-10-22 10:58:49 UTC (rev 533)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/model/User.java	2007-10-22 11:43:45 UTC (rev 534)
@@ -107,11 +107,12 @@
             return;
         }
         
-        Thing oldSeat = this.seatThing;
+        if(this.seatThing != null){
+            space.notifyUserStood(this, this.seatThing);
+        }
+        
         this.seatThing = seatThing;
-        if (seatThing == null) {
-            space.notifyUserStood(this, oldSeat);
-        } else {
+        if (seatThing != null) {
             space.notifyUserSat(this, seatThing);
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.