aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-1730-592/+372
|\
| * Merge branch 'master' into bigmergeMelanie2011-11-1730-592/+372
| |\
| | * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow...Justin Clark-Casey (justincc)2011-11-169-44/+40
| | * Call public ForEach instead of using m_entities directly. No semantic changes...Dan Lake2011-11-161-2/+2
| | * In AddNewClient, iterator over copy of entities rather than copying under rea...Dan Lake2011-11-151-2/+3
| | * Comment out the vebose logging on HGFriendsModule.Justin Clark-Casey (justincc)2011-11-161-12/+11
| | * Fix the build breakJustin Clark-Casey (justincc)2011-11-161-1/+1
| | * Look up a homeURL only when it's not null, in addition to not being string.EmptyJustin Clark-Casey (justincc)2011-11-161-1/+1
| | * Enable log message to tell us what type of url is being requested from a user...Justin Clark-Casey (justincc)2011-11-151-3/+3
| | * Make tracked per scene thread names conform to the majorirty format.Justin Clark-Casey (justincc)2011-11-152-4/+9
| | * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-153-15/+23
| | * Do proper locking of UserManagementModule.m_UserCache when getting.Justin Clark-Casey (justincc)2011-11-151-29/+57
| | * improve formatting of "show threads"Justin Clark-Casey (justincc)2011-11-151-1/+8
| | * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
| | * temporarily increasing logging in HGFriendsModule for debuggingJustin Clark-Casey (justincc)2011-11-151-1/+24
| | * distinguish between FriendsSimConnector and FriendsServiceConnector in logJustin Clark-Casey (justincc)2011-11-152-17/+17
| | * Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)2011-11-152-4/+18
| | * Dont' bother with a userAgentService != null check right after we've construc...Justin Clark-Casey (justincc)2011-11-151-11/+10
| | * Add comments about trying to avoid synchronous work off the EventManager.OnMa...Justin Clark-Casey (justincc)2011-11-153-5/+16
| | * Instead of having scene add/remove collision events directly to the OdeScene ...Justin Clark-Casey (justincc)2011-11-151-20/+38
| | * use a more efficient dictionary in OdeScene._collisionEventPrim rather than a...Justin Clark-Casey (justincc)2011-11-151-7/+4
| | * Removed unused and mostly commented out SceneCommunicationService methodsJustin Clark-Casey (justincc)2011-11-152-116/+3
| | * Remove prebuild reference to now gone PumaCode.SvnDotNet.dllJustin Clark-Casey (justincc)2011-11-151-1/+0
| | * Remove unused RegionCommsListener/IRegionCommsListener.Justin Clark-Casey (justincc)2011-11-153-275/+0
| | * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is n...Justin Clark-Casey (justincc)2011-11-154-11/+6
| | * Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> RecacheFr...Justin Clark-Casey (justincc)2011-11-152-15/+13
| | * refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to better...Justin Clark-Casey (justincc)2011-11-151-5/+5
| | * For clients that are entering a simulator from initial login, stop executing ...Justin Clark-Casey (justincc)2011-11-153-11/+34
| | * refactor: Don't create a new UUID for passing uuids to client - UUIDs are str...Justin Clark-Casey (justincc)2011-11-151-4/+6
| | * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-144-17/+51
* | | Force a sim exit when hearbeat isn't restarting successfullyMelanie2011-11-171-0/+4
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-11-1410-436/+29
|\ \ | |/
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-147-427/+22
| |\
| | * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-117-427/+22
| * | Improved method doc for AddFriend() - it actually does set up a two-way relat...Justin Clark-Casey (justincc)2011-11-143-9/+7
* | | Fix build breakMelanie2011-11-141-2/+1
* | | Merge branch 'master' into bigmergeMelanie2011-11-1412-23/+159
|\ \ \ | |/ /
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-144-11/+2
| * | Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-144-7/+53
| * | Add very simple FriendsModuleTests.TestNoFriends()Justin Clark-Casey (justincc)2011-11-144-3/+91
| * | If a friends identifier which is too short is given to HGFriendsModule.GetOnl...Justin Clark-Casey (justincc)2011-11-142-1/+10
| * | Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to s...Justin Clark-Casey (justincc)2011-11-142-1/+4
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-121-2/+3
|\ \ | |/
| * doh - correct build breakJustin Clark-Casey (justincc)2011-11-121-6/+7
| * Add threads to the watchdog thread list before we start them.Justin Clark-Casey (justincc)2011-11-121-5/+5
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-122-2/+10
* | Merge branch 'master' into bigmergeMelanie2011-11-116-278/+399
|\ \ | |/
| * Make log messages on authentication failure more explicitJustin Clark-Casey (justincc)2011-11-111-13/+26
| * extract common ScenePresence setup code into Init() method for ScenePresenceS...Justin Clark-Casey (justincc)2011-11-111-39/+31
| * add SP.PhysicsActor checks to other sit/stand testsJustin Clark-Casey (justincc)2011-11-111-0/+4