Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 2 | -6/+6 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 2 | -6/+6 |
| | | | | | | | | corresponding RemoteAdmin parameter | ||||
| * | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| | | |||||
* | | Re-Add the reading of attachment data hat was lost in the merge | Melanie | 2012-02-02 | 1 | -1/+46 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 1 | -11/+9 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Prevent a changed attachment that has been saved from being saved again. | Melanie | 2012-02-01 | 1 | -0/+1 |
| | | |||||
| * | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -11/+8 |
| | | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Update save oar and save iar help responses to reflect new -h|--home | nebadon | 2012-01-25 | 1 | -2/+2 |
| | | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar" | ||||
* | | Add some logging | Melanie | 2012-01-17 | 1 | -0/+41 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | If deserializing a scene object fails during IAR load then ignore the object ↵ | Justin Clark-Casey (justincc) | 2012-01-11 | 1 | -1/+4 |
| | | | | | | | | rather than halting the IAR load with an exception. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Add avatar names to appearance log messages | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵ | Diva Canto | 2012-01-10 | 1 | -2/+2 |
| | | | | | | | | (r/17672) | ||||
| * | Don't try to save a NPCs attachment states on NPC delete | Melanie | 2012-01-07 | 1 | -0/+8 |
| | | |||||
* | | Don't try to save a NPCs attachment states on NPC delete | Melanie | 2012-01-07 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -1/+6 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | ||||
| * | Improve "app rebake" command to return a better message if no uploaded ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+6 |
| | | | | | | | | texture ids were available for the rebake request | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 2 | -32/+57 |
|\ \ | |/ | | | | | | | | | 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-04 | 1 | -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-04 | 1 | -31/+41 |
| | | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command). | ||||
| * | Profile Updates | BlueWall | 2012-01-03 | 1 | -5/+7 |
| | | | | | | | | 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 careminster | Melanie | 2012-01-02 | 2 | -24/+60 |
|\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| * | Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵ | Diva Canto | 2011-12-29 | 2 | -24/+60 |
| | | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -11/+55 |
|\ \ | |/ | |||||
| * | Fix race condition where the appearance update timer could be stopped just ↵ | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -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-19 | 1 | -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 careminster | Melanie | 2011-12-14 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵ | Justin Clark-Casey (justincc) | 2011-12-13 | 1 | -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 loading | Melanie | 2011-12-10 | 1 | -14/+6 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -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-09 | 1 | -22/+4 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Add commented log lines to FetchInventoryDescendents2 path for future use. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -0/+2 |
| | | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost | ||||
* | | Fix intersim object give messages | Melanie | 2011-12-07 | 1 | -0/+6 |
| | | |||||
* | | Fix up intersim give messaging | Melanie | 2011-12-07 | 1 | -1/+41 |
| | | |||||
* | | Fix task inventory giving | Melanie | 2011-12-07 | 3 | -41/+16 |
| | | |||||
* | | Remove harmless merge artefact | Melanie | 2011-12-06 | 1 | -1/+1 |
| | | |||||
* | | Adapt GodsModule to core changes | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 3 | -38/+104 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| * | Comment out the vebose logging on HGFriendsModule. | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -12/+11 |
| | | | | | | | | Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends | ||||
| * | temporarily increasing logging in HGFriendsModule for debugging | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+24 |
| | | |||||
| * | Add comments about trying to avoid synchronous work off the ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+4 |
| | | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another. | ||||
| * | remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+0 |
| | | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead | ||||
| * | Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -15/+13 |
| | | | | | | | | RecacheFriends() to reflect their intended function | ||||
| * | refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -5/+5 |
| | | | | | | | | better reflect its actual function |