aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-1926-5565/+5647
|\
| * Merge branch 'master' into bigmergeMelanie2011-11-1926-5565/+5647
| |\
| | * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre...Justin Clark-Casey (justincc)2011-11-192-3/+2
| | * minor: Make HelloNeighbour messages more informativeJustin Clark-Casey (justincc)2011-11-191-5/+10
| | * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-196-10/+13
| | * Enable v2/v3 map tile url setting on robust as default in configJustin Clark-Casey (justincc)2011-11-192-2/+2
| | * Remove mono compiler warnings. Fix problem with co-ordinate given in deregis...Justin Clark-Casey (justincc)2011-11-193-9/+9
| | * Improve some grid region log messages to express regions at co-ordinate (e.g....Justin Clark-Casey (justincc)2011-11-195-13/+50
| | * improve region deregistration log messageJustin Clark-Casey (justincc)2011-11-191-1/+4
| | * Don't register a region twice on both official registration and maptile regen...Justin Clark-Casey (justincc)2011-11-194-8/+11
| | * Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.justincc2011-11-183-5456/+5453
| | * Turn the [RegionReady] module on by default and login_disable = true while sc...Justin Clark-Casey (justincc)2011-11-181-18/+21
| | * Turn SellEnabled in the [EconomyModule] on by default.Justin Clark-Casey (justincc)2011-11-172-15/+16
| | * Fix Windows build breakjustincc2011-11-171-0/+3
| | * For TerrainModule.SaveToFile(), don't bother throwing the exception onwards a...Justin Clark-Casey (justincc)2011-11-171-1/+0
| | * Make "terrain save" more friendly by telling the user if we have saved and pu...Justin Clark-Casey (justincc)2011-11-171-18/+32
| | * If the entire simulator is shutting down then don't bother to unload the scri...Justin Clark-Casey (justincc)2011-11-172-17/+35
* | | 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
| |\
generated by cgit v1.1 at 2025-01-08 05:10:03 +0000