aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-062-12/+30
|\ | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "j2k decode" command to tell us how many layers and components were ↵Justin Clark-Casey (justincc)2012-01-051-5/+16
| | | | | | | | decoded, instead of just success/failure
| * Add a "j2k decode" region console command that allows a manual request for a ↵Justin Clark-Casey (justincc)2012-01-051-8/+10
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-1/+6
| | | | | | | | texture ids were available for the rebake request
* | Merge branch 'master' into careminsterMelanie2012-01-054-32/+154
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Add "appearance rebake" command to ask a specific viewer to rebake textures ↵Justin Clark-Casey (justincc)2012-01-041-3/+12
| | | | | | | | | | | | | | | | from the server end. This is not as useful as it sounds, since you can only request rebakes for texture IDs already received. In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect. Nonetheless, this is useful for diagnostic/debugging purposes.
| * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-041-31/+41
| | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
| * Minor formatting changes and commented out log lines for future debugging of ↵Justin Clark-Casey (justincc)2012-01-041-0/+4
| | | | | | | | image manager (udp texture fetch). No significant functional changes.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-032-0/+5
| |\
| * \ Merge branch 'new_modules'BlueWall2012-01-032-5/+100
| |\ \
| | * | Profile UpdatesBlueWall2012-01-032-5/+100
| | | | | | | | | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | | | Merge branch 'master' into careminsterMelanie2012-01-0212-519/+101
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * | | Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-022-0/+5
| |/ / | | | | | | | | | hunting. No functional changes.
| * | Fix for failed http request statusBlueWall2012-01-011-14/+17
| |/ | | | | | | Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
| * Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵Diva Canto2011-12-296-36/+78
| | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
| * Deleted two obsolete files in Inventory modules.Diva Canto2011-12-292-460/+0
| |
| * Deleted unused methods from HGAssetBrokerDiva Canto2011-12-291-18/+0
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-291-5/+12
| |\
| * | HG: more adjustments for making HG Simian work. Added server_uri as new key ↵Diva Canto2011-12-291-2/+3
| | | | | | | | | | | | on get_agent_home in UAS.
* | | Merge branch 'master' into careminsterMelanie2011-12-281-2/+8
|\ \ \ | | |/ | |/|
| * | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-281-5/+12
| |/ | | | | | | understood by AVN v0.3
| * HG: one more adjustment with trailing /sDiva Canto2011-12-231-2/+8
| |
* | Fix permissions being lost and correct slam behavior, removing icompatibleMelanie2011-12-271-86/+72
| | | | | | | | code inherited from core and dead code.
* | Remove a debug spamMelanie2011-12-271-1/+0
| |
* | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-241-5/+12
| | | | | | | | understood by AVN v0.3
* | Merge branch 'master' into careminsterMelanie2011-12-241-10/+0
|\ \ | |/
| * remove the old region crossing handlerMic Bowman2011-12-231-10/+0
| |
* | Merge branch 'master' into careminsterMelanie2011-12-231-0/+24
|\ \ | |/
| * Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
| | | | | | | | | | | | | | | | into a region that does not exist. This is particularly problematic for physical objects where the velocity continues to move them out of the region causing an infinite number of failed region crossings. The patch forces an object that fails a crossing to be non-physical and moves it back into the starting region.
* | Merge branch 'master' into careminsterMelanie2011-12-221-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are ↵Diva Canto2011-12-221-39/+32
| | | | | | | | passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
* | Merge branch 'master' into careminsterMelanie2011-12-191-11/+55
|\ \ | |/
| * Fix race condition where the appearance update timer could be stopped just ↵Justin Clark-Casey (justincc)2011-12-191-3/+6
| | | | | | | | | | | | after another thread had started it on QueueAppearanceSave() or *Send() However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
| * Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-8/+49
| | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | Merge branch 'master' into careminsterMelanie2011-12-183-5/+25
|\ \ | |/
| * Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-171-3/+9
| | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
| * Sends the consistent child agent position upon creation of the child agent ↵Diva Canto2011-12-161-1/+12
| | | | | | | | in other regions, as opposed to <128, 128, 70>
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-1/+4
| |
* | Merge branch 'master' into careminsterMelanie2011-12-141-2/+2
|\ \ | |/
| * In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵Justin Clark-Casey (justincc)2011-12-131-2/+2
| | | | | | | | | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-101-14/+6
| |
* | Merge branch 'master' into careminsterMelanie2011-12-101-21/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * 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
| | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-11/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-11/+6
| | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* | 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
| |