aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-082-4/+4
|\
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-6/+11
|\ \ | | | | | | | | | careminster
| * | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-261-1/+1
| | |
| * | Delay the sending of the initial werables update until the inventory andMelanie2012-02-251-6/+11
| | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login
* | | Merge branch 'master' into careminsterMelanie2012-03-031-2/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-251-3/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| |
* | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-151-9/+31
| |\ \
| * | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-181-0/+4
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by ↵Dan Lake2012-02-171-0/+4
| | | | | | | | | | | | AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
* | | Merge branch 'master' into careminsterMelanie2012-02-151-9/+31
|\ \ \ | |/ / | | / | |/ |/|
| * Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-9/+31
| |
* | Merge branch 'master' into careminsterMelanie2012-02-042-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 Pfeffer2012-02-032-6/+6
| | | | | | | | corresponding RemoteAdmin parameter
| * Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
| |
* | Re-Add the reading of attachment data hat was lost in the mergeMelanie2012-02-021-1/+46
| |
* | Merge branch 'master' into careminsterMelanie2012-02-011-11/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Prevent a changed attachment that has been saved from being saved again.Melanie2012-02-011-0/+1
| |
| * Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-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 careminsterMelanie2012-01-261-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|--homenebadon2012-01-251-2/+2
| | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar"
* | Add some loggingMelanie2012-01-171-0/+41
| |
* | Merge branch 'master' into careminsterMelanie2012-01-121-1/+4
|\ \ | |/
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-111-1/+4
| | | | | | | | rather than halting the IAR load with an exception.
* | Merge branch 'master' into careminsterMelanie2012-01-101-3/+3
|\ \ | |/
| * Add avatar names to appearance log messagesJustin Clark-Casey (justincc)2012-01-101-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵Diva Canto2012-01-101-2/+2
| | | | | | | | (r/17672)
| * Don't try to save a NPCs attachment states on NPC deleteMelanie2012-01-071-0/+8
| |
* | Don't try to save a NPCs attachment states on NPC deleteMelanie2012-01-071-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-01-061-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-051-1/+6
| | | | | | | | texture ids were available for the rebake request
* | Merge branch 'master' into careminsterMelanie2012-01-052-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-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).
| * Profile UpdatesBlueWall2012-01-031-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 careminsterMelanie2012-01-022-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 Canto2011-12-292-24/+60
| | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
* | 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-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
| |
generated by cgit v1.1 at 2024-12-22 10:25:47 +0000