aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-101-21/+1
|\
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
* | Merge branch 'master' into careminsterMelanie2011-12-091-0/+2
|\ \ | |/
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-091-0/+2
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-11/+6
|\ \ | |/
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-11/+6
* | Fix intersim object give messagesMelanie2011-12-071-0/+6
* | Fix up intersim give messagingMelanie2011-12-071-1/+41
* | Fix task inventory givingMelanie2011-12-073-41/+16
* | Remove harmless merge artefactMelanie2011-12-061-1/+1
* | Adapt GodsModule to core changesMelanie2011-12-051-2/+2
* | Remove erroneous message about hyperlinks when entering an invalid region nameMelanie2011-12-051-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-12-054-7/+7
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-051-2/+2
| |\
| | * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-2/+2
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-054-7/+7
| |/
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int...Melanie2011-12-051-2/+2
|\ \
| * | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-2/+2
* | | Merge branch 'master' into bigmergeMelanie2011-12-052-103/+109
|\ \ \ | |/ / |/| / | |/
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-032-5/+5
| * Stop some places where we're trying to reset animations in child agents where...Justin Clark-Casey (justincc)2011-12-021-100/+110
* | Strip CR from http responses and limit them to 2048 charsMelanie2011-12-051-1/+3
* | Merge branch 'master' into bigmergeMelanie2011-12-012-9/+13
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+1
| * Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-3/+2
| * tabulate "show caps" output for easier readabilityJustin Clark-Casey (justincc)2011-11-291-5/+10
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/
| * Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots...Justin Clark-Casey (justincc)2011-11-241-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-193-25/+42
|\ \ | |/
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre...Justin Clark-Casey (justincc)2011-11-191-1/+0
| * minor: Make HelloNeighbour messages more informativeJustin Clark-Casey (justincc)2011-11-191-5/+10
| * 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
* | Merge branch 'master' into bigmergeMelanie2011-11-176-80/+177
|\ \ | |/
| * 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-151-3/+6
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-7/+8
| * Do proper locking of UserManagementModule.m_UserCache when getting.Justin Clark-Casey (justincc)2011-11-151-29/+57
| * temporarily increasing logging in HGFriendsModule for debuggingJustin Clark-Casey (justincc)2011-11-151-1/+24
| * Add comments about trying to avoid synchronous work off the EventManager.OnMa...Justin Clark-Casey (justincc)2011-11-151-1/+4
| * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is n...Justin Clark-Casey (justincc)2011-11-151-1/+0
| * 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-152-7/+28
| * 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-142-11/+31
* | Merge branch 'master' into bigmergeMelanie2011-11-142-4/+5
|\ \ | |/